Merge branch 'fix-otp-version-file-in-docker' into 'develop'