Move #1470 to 1.593