commit #532