FORGE-1193: Fixed subflow navigation