Merge "Remove instances of finding a property before RegisterProperty" into devel...