Merge branch 'cpu_cooling-doc-comments-update' of .git into next