Merge branch 'viafb-olpc' into viafb-next