Merge branch 'ci/build-otp-maint' into 'develop'