Closes: #722126