[IMP] Fix NC/ND

Merged Jose Luis Zanotti requested to merge T4721 into 12.0-production-v2

Merge request reports