Closes: #722461