=Master-04 migration continued - still compilation errors