Created by: cvrebert
Fixes #16361 (closed). Refs #16356 (closed). CC: @XhmikosR @hnrch02 @fat for review