Merge pull request #120983 from smix8/physics_mambo