Asi for upstream

Bug fixes for minor issues in the mrp_client module.