Merge branch 'dev' into feature_maintenance
Removed unnecessary support library; updated support v7 version
Cleanup
Merge branch 'feature_maintenance' into dev