Untangling publish and force publish

Detail to follow...