Merge branch 'patch_sjf4j_typo' into develop