maintain CP shape
[FEATURE composable-computed-properties] maintain CP shape
Merge pull request #4327 from stefanpenner/maintain-cp-shape

Maintain cp shape