Merge "Changes following "Make TextureSet a non property owner"" into devel/master