[IMP] Add new iva condition and fixes

Merged Jose Luis Zanotti requested to merge Fix into 12.0

Merge request reports