v3 features for master

Merge new v3 features into master for next release.
@maethu