Merge "Fix docs references to header files" into integration