ContentBehavior owner = getOwner()
Merge with master