Merge "next" branch into master sources tree