commit #696