Merge branch 'fix/configdb-otp-instructions' into 'develop'