Minor changes for Code Highlights
Merge branch 'develop'

* develop:
  Minor changes for Code Highlights