[MOD] Bug and manifest fix

Merged Jose Luis Zanotti requested to merge DPI353 into 12.0-stage

Merge request reports