Implemented as part of PR #4957 .
Implemented as part of PR #4957 .