bugfix
Merge branch 'release/1.2-moorfields' into jira/2546