fixes #503 and fixes #506
fixes #505, only cut-pasted when shape is corrupted
resolves #501
Merge branch 'Feature-CustomShapes' into dev-1.8