Merge "Added the bug number to the flag" into main