by @tkrokli + @Pitcrawler , closes #15737 (cherry picked from commit db8aba662ae94aeaab74ae2ae29c38cf0b8bffb4)