Merging Avalon R2 branch into master