Closes: #571174