Merge "refactor(bl): remove un-necessary variable" into integration