Two files left off
Merge branch 'hotfix-2.1.18' into develop