Merge "Moved transport to IntDef"