APLANATS-539, APLANATS-596
Merge remote-tracking branch 'origin/master'