Merge proposals dependent on lp://staging/~therp-nl/therp-backports/addons-6.1-lp1119397_account_install

1. addons-6.1-lp1119397_account_install
2. Dependent merge proposals