Merge proposals dependent on lp://staging/~gdukai/wms/fix-837952

lp://staging/~gdukai/wms/fix-837952 has no merge proposals.