Correspondence locking is suspended until discussions about draft usage
are resolved.
[OE-3984] fixed error on delete page
Merge branch 'master' into release/1.6
Merge branch 'release/1.6' into develop