Only copy live from draft if it is defined
Remove getOrElse and use get since we are using isDefined beforehand
Clean discardBlock
Merge branch 'concurrent-publish'
Merge remote-tracking branch 'origin/master'