2.0.0 dev - Merge from Head Fork