APLANATS-601: fix
APLANATS-603
Merge remote-tracking branch 'origin/master'