ref #6595 Fix composite cascade
ref #6595 Initial commit of migrated/refactored classes (not working)