Jbide 13537

This commit cannot just be merged in, but should instead be cherry-picked, due to my own failures ;)  But a proper cherry pick will apply cleanly to branch.