Migrated services to the new standard
Cleanup for duplicate function that has become local to specific extension
Merge branch 'master' into CMigration
C Migration for services