Merge proposals

services-manager has no merge proposals.