Fix expectation
Merge branch 'refs/heads/feature-one-click-update' into staging