Merge branch 'plu/fix-tap-dismiss' into plu/xing
Merge branch 'plu/filter-duplicates' into plu/xing