Backport of #4960 to stable5

refs #4960 

Let's see ....