[PROJXP] Superceded previous patch