- Added features to master which I had placed in the v7-support-lib-integration branch