FORGE-1929: Reordered inputs