Merge 1.8 revision 25612 to cmake branch.
Include plugin header change.