Merge "Fixing filtering contacts by account"