added patches for 2.0.0-p247