Merge branch 'fix/mix-tasks-failing-otp' into 'develop'