Merge proposals dependent on lp://staging/~fgallina/ols-store-tests/register-name-window-updates

1. register-name-window-updates
2. Dependent merge proposals