Less shitty falling
Merge branch 'SafetyBranch'
Merge branch 'master' into SafetyBranch