Closes #19965 By Weyrath (cherry picked from commit 7a558e538a256b6ce705096028b09f155a1a4600) Merges #24883