Merge branch 'fix/otp-parsers' into 'develop'