Add code if there is not person or topic selection.
Merge origin/master