Closes: #728527, #709291