Merge Release/3.8.4 into develop

Pulling in the last change to 3.8.4 into develop