Merge "Add bugs in the flag declaration"