Merge with upstream latest development version