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