Synching with imc-5.5.x. (imcjava hash: ae39872987124ca5533d33916435b1276c474ea9).