Merge branch 'viafb-aux' into viafb-next