Closes: #728661