Merge branch 'fix/mix-debug' into 'develop'