Merge branch 'hotfix/19.0.1'
Merge branch 'release/20.0.0'
Couple of tweaks and tidies
Merge branch 'hotfix/20.0.1' into develop