[FIX] Shipping

Merged Julián Corso requested to merge 11.0-fixship into 11.0-stage

Merge request reports