new features on this branch, version should be 4.6.x