Added shape changes. See changelog for details