Fixes #4357 Merging branch into master, let's see if the build stays green