FIX: Removed constraint to product_macro_custom

Merged Santiago Said requested to merge FixSearchProductByPSI into 11.0-stage

Merge request reports