APLANATS-1114
Merge remote-tracking branch 'origin/master'