Fix for In-Story Highlighter
Merge branch 'dev'