DUNE/IMC: Synchronized with IMC release/5.4.x.