Merge changes from master in services.ts