Merge branch 'jims/291patches' into develop