[TIMOB-14988] Overcome our KVC issues