commit #652