Changes for 1.8.4
Merge branch 'release/1.8.4' into develop