commit #534