Merge branch 'SafetyBranch'
optimizings
Merge branch 'master' into SafetyBranch