Rebase weston patch to master