Rebased patch 940713