Closes: #731232