* Apply logging from hotfixes branch to develop Part of #4826. Originally added in #11882. * Changelog