Merge proposals dependent on lp:~kelwin-lee/scratch/fix-1212656

lp:~kelwin-lee/scratch/fix-1212656 has no merge proposals.