sync-up changes from main stream