provide flag to disable publishing resolution
Merge branch 'master' into develop