Using imc defitions from release/5.4.x