Merge "Handle pcp-dstat transition"