Merge branch 'common/pfc' into sh-latest