Merge "RCLFilters: make target and to/from parameters sticky again"