Merge pull request #1654 from Azaezel/shape_mounting