Identical to PR #1516 Targeted to Release-0.11

Can be merged at the same time as #1516.