Merge 'local-services' to 'master' branch