Merge "Replace $(findstring) by $(filter)"