Merged changes from v3.0