We normalize position already, but just to be sure...
Merge branch 'mgsdl2-xact' into mgsdl2-hwinstance