APLANATS-583
OQSync fix
APLANATS-580
Merge remote-tracking branch 'origin/master'