Merge branch 'rt/bfg-ad-in-filter-branch-doc'