Merge changes from topic 'find-in-source-view'