Fix #1207 Those analysis remarks fields...
Merge branch 'issue/1207' into develop