Fix for Continuous publication
Fix for Continuous publication
Merge origin/master