Merge branch 'bugfix/crypt-pragma' into 'develop'