Merge proposals dependent on lp://staging/~deryck/launchpad/series-targeted-with-zero-bugs-364712

1. series-targeted-with-zero-bugs-364712
2. Dependent merge proposals