Merge "Merge prediction filter" into experimental