[TIMOB-13517] Moved the ref to __values__ inside the getters/setters so that we can override the store.
Merge pull request #4142 from cb1kenobi/timob-13517

[TIMOB-13517] Moved the ref to __values__ inside the getters/setters so ...