OneBallDynamic and such code that fixes launches
Merge origin/develop