Use OPT_FLAG and check flag before support check. (Squish before merge)