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