Kirill Gaevskii updated Task WELD-1836