Critical path header changes for the pics merge