Update to ssr branch to be inline with master