[1603] ported patches for 1720 and 1689