OQSync fix
Merge remote-tracking branch 'origin/version_1_4_5' into version_1_4_5