A4

Merge proposals dependent on lp://staging/~andrea-gualano/a4/fix-600784

lp://staging/~andrea-gualano/a4/fix-600784 has no merge proposals.