By @Killyana, Initial work by @tkrokli Closes #14294 (cherry picked from commit 35ead9632db7042f7e2ed30827de8668c3a43420)