Merge master into symmetryPlane