Merge branch 'static-remote-redirect' into 'develop'