Merge "Always return the same message when the draft workflow is disabled"