Back port - TIMOB-13777 - Layout stuff