Merge "Port categories dump header fix"