mse239382 partially fixed, remaining issues now reported as mse239549