Merge "Add new filter status NO_DATA"