Merge "Remove unused $terms parameter"