Getting develop current with release/3.8.4 rc4

This brings develop current with changes made for 3.8.4 up to rc4.