rebases 2.0.0 head patches
added patches for 2.0.0-p481