Merge branch 'docs_make_otp_recommendation_clearer' into 'develop'