Rob, I have submitted my fix for Issue6847. It has been rebased on develop. Please unblock and review. Ron