Changes for publishing
Merge remote-tracking branch 'origin/Published-State' into developer