Merge "Testing documentation commit with header fix"