[TIMOB-17640] CR fixes