Merge branch 'master' into develop
Updated packages.
Removed unused field groups.
Merge branch 'develop'