Roll out common changes on trunk