commit #525