Rebase against official plugin repo