Hacky rebase sourced from develop.svn