Merge branch master into feature-shape-update