more work on compound shape
merge master