Sync with upstream changes after Merge #1