CrossFilter changes

Change-Id: I6bac1b59c5ada742320113058d1ca89a82ad3e64