Synching with imc-5.4.x. (imc hash: daabf44c05f69fd1a0cdbdade4ff26ef3bdd491a)