Change from v4 support library to v7
Merge branch 'master' into testing