Correspondence locking is suspended until discussions about draft usage
are resolved.
Merge branch 'master' into release/1.6