Merge "Fix blocking call on FMQ critical path" into main