Merged dev/vasya/EUCA-8531.
Fixes for: EUCA-8531, EUCA-8584