Merge "Verify inputs to PAC resolving." into klp-dev