Revert "Merge branch 'develop' into '74-follow-up-from-draft-resolve-pnd-handling-via-cli-and-database'" This reverts commit 7d6f3967
