All-in-one update from upstream git repository