Merge "Doc change: minor fixes to highlights and images." into klp-dev