commit #697