Merge "APM: support product strategy routing"