PFS & ACG updates

This should resolve the merge problem as long as no other PR's that change the files that this changes are pulled in when based upon a much older master.