Merge "Add additional flag for FMQ SF" into main