SAMOLDSHIT-1477

SAMOLDSHIT-1477