Merge "Fix position error when INHERIT_POSITION is false" into devel/master