sync with upstream and fix merge conflicts