Compose and other things
merging from trunk