TBD-1064 : Add support MapR401 on DI part
Merge branch 'maintenance/5.6'