Re #7737. Remove no-longer-used variables.
Merge branch 'bugfix/7737_filterbytime_same_input_output' into develop