Eka commit. Tracker ID 6543927