credit, issue #1386, PR #1397
Merge remote-tracking branch 'origin/issue_1386' into issue_1386