Changes for PR #1611