diff --git a/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1308-1.aql b/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1308-1.aql
new file mode 100644
index 0000000..2f56f85
--- /dev/null
+++ b/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1308-1.aql
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+declare function median($x)
+{
+   let $c := count($x)
+   return avg(
+                for $i at $p in (for $j in $x order by $j return $j)
+                where $p >= floor(($c-1)/2.0) and $p <= $c/2
+                return $i
+             )
+}
+
+
+declare function MAD($x)
+{
+     let $m := median($x)
+     return median(for $j in $x order by abs($j-$m) return abs($j-$m))
+}
+
+MAD([2, 3, 4, 1, 5, 6, 10, 0])
+
diff --git a/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1308-2.aql b/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1308-2.aql
new file mode 100644
index 0000000..028e436
--- /dev/null
+++ b/asterix-app/src/test/resources/optimizerts/queries/udfs/query-ASTERIXDB-1308-2.aql
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+drop dataverse test if exists;
+create dataverse test;
+use dataverse test;
+
+create type HRMType as closed {
+  row_id: int32,
+  sid: int32,
+  date: date,
+  day: int32,
+  time: time,
+  bpm: int32,
+  RR: float
+};
+
+create dataset HRM(HRMType) primary key row_id;
+
+declare function median($x)
+{
+     let $c := count($x)
+     return avg(
+                for $i at $p in (for $j in $x order by $j return $j)
+                where $p >= floor(($c-1)/2.0) and $p <= $c/2
+                return $i
+               )
+}
+
+
+declare function MAD($x)
+{
+     let $m := median($x)
+     return median(for $j in $x order by abs($j-$m) return abs($j-$m))
+}
+
+for $i in dataset HRM
+group by $sid := $i.sid, $gdate := $i.date, $gday := $i.day,
+$timebin := interval-bin($i.time, time("00:00:00"), day-time-duration("PT15M")) with $i
+return
+{
+  "sid": $sid,
+  "gdate": $gdate,
+  "gday": $gday,
+  "timebin": $timebin,
+  "stdv": (avg(for $ii in $i return $ii.RR * $ii.RR) -
+          avg(for $ii in $i return $ii.RR) * avg(for $ii in $i return $ii.RR))^(0.5),
+  "MAD": MAD(for $ii in $i return $ii.RR)
+}
+
diff --git a/asterix-app/src/test/resources/optimizerts/results/udfs/query-ASTERIXDB-1308-1.plan b/asterix-app/src/test/resources/optimizerts/results/udfs/query-ASTERIXDB-1308-1.plan
new file mode 100644
index 0000000..ebbee79
--- /dev/null
+++ b/asterix-app/src/test/resources/optimizerts/results/udfs/query-ASTERIXDB-1308-1.plan
@@ -0,0 +1,45 @@
+-- DISTRIBUTE_RESULT  |LOCAL|
+  -- ONE_TO_ONE_EXCHANGE  |LOCAL|
+    -- AGGREGATE  |LOCAL|
+      -- AGGREGATE  |LOCAL|
+        -- STREAM_PROJECT  |UNPARTITIONED|
+          -- STREAM_SELECT  |UNPARTITIONED|
+            -- STREAM_PROJECT  |UNPARTITIONED|
+              -- ASSIGN  |UNPARTITIONED|
+                -- STREAM_PROJECT  |UNPARTITIONED|
+                  -- UNNEST  |UNPARTITIONED|
+                    -- SUBPLAN  |UNPARTITIONED|
+                            {
+                              -- AGGREGATE  |UNPARTITIONED|
+                                -- IN_MEMORY_STABLE_SORT [$$28(ASC)]  |UNPARTITIONED|
+                                  -- UNNEST  |UNPARTITIONED|
+                                    -- NESTED_TUPLE_SOURCE  |UNPARTITIONED|
+                            }
+                      -- AGGREGATE  |UNPARTITIONED|
+                        -- ONE_TO_ONE_EXCHANGE  |UNPARTITIONED|
+                          -- STABLE_SORT [$$59(ASC)]  |UNPARTITIONED|
+                            -- ONE_TO_ONE_EXCHANGE  |UNPARTITIONED|
+                              -- STREAM_PROJECT  |UNPARTITIONED|
+                                -- ASSIGN  |UNPARTITIONED|
+                                  -- STREAM_PROJECT  |UNPARTITIONED|
+                                    -- UNNEST  |UNPARTITIONED|
+                                      -- SUBPLAN  |UNPARTITIONED|
+                                              {
+                                                -- SUBPLAN  |UNPARTITIONED|
+                                                        {
+                                                          -- AGGREGATE  |UNPARTITIONED|
+                                                            -- STREAM_SELECT  |UNPARTITIONED|
+                                                              -- UNNEST  |UNPARTITIONED|
+                                                                -- SUBPLAN  |UNPARTITIONED|
+                                                                        {
+                                                                          -- AGGREGATE  |UNPARTITIONED|
+                                                                            -- IN_MEMORY_STABLE_SORT [$$21(ASC)]  |UNPARTITIONED|
+                                                                              -- UNNEST  |UNPARTITIONED|
+                                                                                -- NESTED_TUPLE_SOURCE  |UNPARTITIONED|
+                                                                        }
+                                                                  -- NESTED_TUPLE_SOURCE  |UNPARTITIONED|
+                                                        }
+                                                  -- NESTED_TUPLE_SOURCE  |UNPARTITIONED|
+                                              }
+                                        -- ASSIGN  |UNPARTITIONED|
+                                          -- EMPTY_TUPLE_SOURCE  |UNPARTITIONED|
diff --git a/asterix-app/src/test/resources/optimizerts/results/udfs/query-ASTERIXDB-1308-2.plan b/asterix-app/src/test/resources/optimizerts/results/udfs/query-ASTERIXDB-1308-2.plan
new file mode 100644
index 0000000..a6e7496
--- /dev/null
+++ b/asterix-app/src/test/resources/optimizerts/results/udfs/query-ASTERIXDB-1308-2.plan
@@ -0,0 +1,75 @@
+-- DISTRIBUTE_RESULT  |PARTITIONED|
+  -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+    -- STREAM_PROJECT  |PARTITIONED|
+      -- ASSIGN  |PARTITIONED|
+        -- STREAM_PROJECT  |PARTITIONED|
+          -- SUBPLAN  |PARTITIONED|
+                  {
+                    -- SUBPLAN  |LOCAL|
+                            {
+                              -- SUBPLAN  |LOCAL|
+                                      {
+                                        -- SUBPLAN  |LOCAL|
+                                                {
+                                                  -- AGGREGATE  |LOCAL|
+                                                    -- STREAM_SELECT  |LOCAL|
+                                                      -- ASSIGN  |LOCAL|
+                                                        -- UNNEST  |LOCAL|
+                                                          -- SUBPLAN  |LOCAL|
+                                                                  {
+                                                                    -- AGGREGATE  |LOCAL|
+                                                                      -- IN_MEMORY_STABLE_SORT [$$38(ASC)]  |LOCAL|
+                                                                        -- UNNEST  |LOCAL|
+                                                                          -- NESTED_TUPLE_SOURCE  |LOCAL|
+                                                                  }
+                                                            -- NESTED_TUPLE_SOURCE  |LOCAL|
+                                                }
+                                          -- NESTED_TUPLE_SOURCE  |LOCAL|
+                                      }
+                                -- SUBPLAN  |LOCAL|
+                                        {
+                                          -- AGGREGATE  |LOCAL|
+                                            -- IN_MEMORY_STABLE_SORT [$$98(ASC)]  |LOCAL|
+                                              -- ASSIGN  |LOCAL|
+                                                -- UNNEST  |LOCAL|
+                                                  -- NESTED_TUPLE_SOURCE  |LOCAL|
+                                        }
+                                  -- NESTED_TUPLE_SOURCE  |LOCAL|
+                            }
+                      -- SUBPLAN  |LOCAL|
+                              {
+                                -- SUBPLAN  |LOCAL|
+                                        {
+                                          -- AGGREGATE  |LOCAL|
+                                            -- STREAM_SELECT  |LOCAL|
+                                              -- ASSIGN  |LOCAL|
+                                                -- UNNEST  |LOCAL|
+                                                  -- SUBPLAN  |LOCAL|
+                                                          {
+                                                            -- AGGREGATE  |LOCAL|
+                                                              -- IN_MEMORY_STABLE_SORT [$$31(ASC)]  |LOCAL|
+                                                                -- UNNEST  |LOCAL|
+                                                                  -- NESTED_TUPLE_SOURCE  |LOCAL|
+                                                          }
+                                                    -- NESTED_TUPLE_SOURCE  |LOCAL|
+                                        }
+                                  -- NESTED_TUPLE_SOURCE  |LOCAL|
+                              }
+                        -- NESTED_TUPLE_SOURCE  |LOCAL|
+                  }
+            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+              -- PRE_CLUSTERED_GROUP_BY[$$94, $$95, $$96, $$97]  |PARTITIONED|
+                      {
+                        -- AGGREGATE  |LOCAL|
+                          -- NESTED_TUPLE_SOURCE  |LOCAL|
+                      }
+                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                  -- STABLE_SORT [$$94(ASC), $$95(ASC), $$96(ASC), $$97(ASC)]  |PARTITIONED|
+                    -- HASH_PARTITION_EXCHANGE [$$94, $$95, $$96, $$97]  |PARTITIONED|
+                      -- STREAM_PROJECT  |PARTITIONED|
+                        -- ASSIGN  |PARTITIONED|
+                          -- STREAM_PROJECT  |PARTITIONED|
+                            -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                              -- DATASOURCE_SCAN  |PARTITIONED|
+                                -- ONE_TO_ONE_EXCHANGE  |PARTITIONED|
+                                  -- EMPTY_TUPLE_SOURCE  |PARTITIONED|