diff --git a/CHANGELOG b/CHANGELOG
index 57243cc920..c0f6c34930 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 devel
 -----
 
+* increase default collection lock timeout from 30 to 900 seconds
+
 * added function `db._engine()` for retrieval of storage engine information at
   server runtime
 
diff --git a/arangod/Transaction/Methods.h b/arangod/Transaction/Methods.h
index 2d55191409..72e6520b4d 100644
--- a/arangod/Transaction/Methods.h
+++ b/arangod/Transaction/Methods.h
@@ -84,7 +84,7 @@ class Methods {
  public:
 
   /// @brief time (in seconds) that is spent waiting for a lock
-  static constexpr double DefaultLockTimeout = 30.0; 
+  static constexpr double DefaultLockTimeout = 900.0; 
 
   class IndexHandle {
     friend class transaction::Methods;
diff --git a/js/server/tests/aql/aql-arithmetic.js b/js/server/tests/aql/aql-arithmetic.js
index 897f4243d2..3efb46f38f 100644
--- a/js/server/tests/aql/aql-arithmetic.js
+++ b/js/server/tests/aql/aql-arithmetic.js
@@ -54,6 +54,11 @@ function ahuacatlArithmeticTestSuite () {
     tearDown : function () {
     },
 
+    testConstAttributeAccess : function () {
+      var actual = getQueryResults("LET it = { a: 4, b: 5, c: 6 } RETURN [ it.a * 3, it.b * 4, it.c * 5 ]");
+      assertEqual([ [ 4 * 3, 5 * 4, 6 * 5 ] ], actual);
+    },
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test unary plus
 ////////////////////////////////////////////////////////////////////////////////