[managed][client][offline] Post dev merge fixes