Add Closes: #736961