Backport changes based on feedback from DEV system

These are backports from `master` to the `3.4-stable` branch for fixes that were made based on the client feedback from the DEV system.