Minimise changes from master plugin repo