[MERGE] pos improvements

manual fix of fp-style merge