SDPII-35 Adding Filter
SDPII-35 Merge Conflict