commit #736