manual cherry-pick
Merge pull request #164 from bryan-m-hughes/timob-13504-1_0_X

Timob 13504-1_0_X Fixed object properties not always showing their full name