[AndrewBilukha-01] Start of changes