merge with commit de08bce3fc3fb251672a7894ebb51f8819388ec6
base url bug fix
merge with commit d18d7d1ea8485b1bfc92c294df048b361eb3a7c5
Merge remote-tracking branch 'upstream/beta' into beta