Optimization for compose (breaking)
Compose test coverage
Merge pull request #1700 from megawac/compose

Breaking: Optimization for compose