Merge "Updating owners in core and in resources"