Refs #6721 new MANDI IDF
Merge remote branch 'origin/feature/6721_UpdateMANDI'