Merge proposals dependent on lp://qastaging/~divmod-dev/divmod.org/private-index-page-2985-2

1. private-index-page-2985-2
2. Dependent merge proposals