Merge branch 'fix-9534' into develop

Conflicts:
	tests/unit/position/position.html
	tests/unit/position/position_core.js