Merge proposals dependent on lp://staging/~gary-lasker/software-center/fix-lp1023777-for-5.2

1. fix-lp1023777-for-5.2
2. Dependent merge proposals