Created by: cvrebert
Fixes #15741 (closed). Closes #15751 by merging it. CC: @hnrch02 for final re-review