Merge branch 'DIRMINA-1123' into 2.1.X