Merge "Create flag for BAL strict mode" into main