Bring develop current with changes from release/3.8.4