Merge branch 'Bitra2' into Bitra.LA.2.0