Changes for PR #1600 and PR #1611