fix.
Merge branch 'BGv1_Norris'