Merge branch 'viafb-samm' into viafb-next