Merge branch 'hotfix/4321'

Close #4321
Revert addition of docblock to test asset

- Broke test, as test was not expecting/generating docblock
Merge branch 'hotfix/code-generator-test' into develop

Forward port test fix