Merge "BlockLevelPass: minor changes due to initial code review"