Merge branch 't1_fix_bag'