[TIMOB-16927] Fixes for Kitchen Sink