Underlying maintenance message flow bug fixes