Changes for issue #4200