Merge branch 'fix/digest-task-otp' into 'develop'