Merge "Use distinct value for BAL_BLOCK" into main