Merge branch 'reportnote-test' into 'develop'