diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
index 0ae6dcd448..f3a365ad05 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
@@ -105,6 +105,7 @@ class DefaultRenderContext extends AbstractContext<RenderContext> implements Ren
         castMode(context.castMode());
         declareFields(context.declareFields());
         declareTables(context.declareTables());
+        data().putAll(context.data());
     }
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/test/java/org/jooq/test/AbstractTest.java b/jOOQ/src/test/java/org/jooq/test/AbstractTest.java
index 214bd411b6..e7a23f9c81 100644
--- a/jOOQ/src/test/java/org/jooq/test/AbstractTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/AbstractTest.java
@@ -67,7 +67,7 @@ public abstract class AbstractTest {
 
     protected Mockery              context;
     protected PreparedStatement    statement;
-    protected DSLContext             create;
+    protected DSLContext           create;
     protected Result<Table1Record> resultEmpty;
     protected Result<Table1Record> resultOne;
     protected Result<Table1Record> resultTwo;
diff --git a/jOOQ/src/test/java/org/jooq/test/BindContextTest.java b/jOOQ/src/test/java/org/jooq/test/BindContextTest.java
new file mode 100644
index 0000000000..7c110bada5
--- /dev/null
+++ b/jOOQ/src/test/java/org/jooq/test/BindContextTest.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) 2009-2013, Lukas Eder, lukas.eder@gmail.com
+ * All rights reserved.
+ *
+ * This software is licensed to you under the Apache License, Version 2.0
+ * (the "License"); You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * . Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * . Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * . Neither the name "jOOQ" nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.jooq.test;
+
+import static org.junit.Assert.assertEquals;
+
+import org.jooq.BindContext;
+import org.jooq.RenderContext;
+import org.jooq.exception.DataAccessException;
+import org.jooq.impl.CustomCondition;
+
+import org.junit.Test;
+
+/**
+ * Some common tests related to {@link RenderContext}
+ *
+ * @author Lukas Eder
+ */
+public class BindContextTest extends AbstractTest {
+
+    @Test
+    public void testData() {
+        BindContext ctx = create.bindContext(statement);
+        ctx.data("key", "value");
+
+        TestDataQueryPart part = new TestDataQueryPart();
+        ctx.bind(part);
+        assertEquals("value", part.value);
+    }
+
+    private static class TestDataQueryPart extends CustomCondition {
+
+        /**
+         * Generated UID
+         */
+        private static final long serialVersionUID = 2310925428858496140L;
+
+        Object value;
+
+        @Override
+        public void toSQL(RenderContext context) {
+        }
+
+        @Override
+        public void bind(BindContext context) throws DataAccessException {
+            value = context.data("key");
+        }
+
+    }
+}
diff --git a/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java b/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java
new file mode 100644
index 0000000000..6c01a00c9d
--- /dev/null
+++ b/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java
@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) 2009-2013, Lukas Eder, lukas.eder@gmail.com
+ * All rights reserved.
+ *
+ * This software is licensed to you under the Apache License, Version 2.0
+ * (the "License"); You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * . Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * . Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * . Neither the name "jOOQ" nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.jooq.test;
+
+import static org.junit.Assert.assertEquals;
+
+import org.jooq.BindContext;
+import org.jooq.RenderContext;
+import org.jooq.exception.DataAccessException;
+import org.jooq.impl.CustomCondition;
+
+import org.junit.Test;
+
+/**
+ * Some common tests related to {@link RenderContext}
+ *
+ * @author Lukas Eder
+ */
+public class RenderContextTest extends AbstractTest {
+
+    @Test
+    public void testData() {
+        RenderContext ctx = create.renderContext();
+        ctx.data("key", "value");
+
+        TestDataQueryPart part = new TestDataQueryPart();
+        ctx.render(part);
+        assertEquals("value", part.value);
+    }
+
+    private static class TestDataQueryPart extends CustomCondition {
+
+        /**
+         * Generated UID
+         */
+        private static final long serialVersionUID = 2310925428858496140L;
+
+        Object value;
+
+        @Override
+        public void toSQL(RenderContext context) {
+            value = context.data("key");
+        }
+
+        @Override
+        public void bind(BindContext context) throws DataAccessException {}
+
+    }
+}