Merge "Fix srcgen problems in BC"