commit #740