sync options
Merge branch 'master' into tags-master
sync options: fixes
Merge branch 'master' into tags-master