Merge "Initial change on carrier signal filtering"