uml v0.31 adaptation
sync async commits

and some collisionprep tests