Merge "Differ platform and user scope in service and application"