Synching with imc-5.4.x. (imc hash: 1186674f759abd1f64e6520bb9b3d8ad8aa48767)