SCATTER-262 this should prevent the thing from return null in getPosition
Merge branch '8.36'