Changes for issue3997
Changes for issue 3975