Created by: spuder
Resolves Issue #5258 (closed) Should be applied to both master and 6-1-stable branches