Merge "Set a default value for flagstatus" into main