User based filtering, adding section.
Merge origin/master