Merge branch 'prepared-statements-settings' into 'develop'