diff --git a/ThirdParty/AllMake.stage5 b/ThirdParty/AllMake.stage5
index 5a7c2f147..3390e406d 100755
--- a/ThirdParty/AllMake.stage5
+++ b/ThirdParty/AllMake.stage5
@@ -62,7 +62,7 @@ echo
 # which is also replicated under the Breeder_2.0 section of the Subversion repository
 #
 
-SWAK_RELEASE_VERSION=0.4.0
+SWAK_RELEASE_VERSION=0.4.2
 
 if [ -z "$SWAK4FOAM_SYSTEM" ]
 then
@@ -78,16 +78,22 @@ then
         then
             echo "Using Mercurial/hg to download the source code for swak4Foam"
             (
-                cd ./rpmBuild/BUILD;
-                hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION;
-                cd swak4Foam-$SWAK_RELEASE_VERSION;
-                hg checkout version_${SWAK_RELEASE_VERSION}_v2.x
+                cd ./rpmBuild/BUILD
+                hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION
+                cd swak4Foam-$SWAK_RELEASE_VERSION
+                #hg checkout version_${SWAK_RELEASE_VERSION}_v2.x
+                # We use dev-branch temporarily
+                hg checkout compile_foamExtend4.1
             )
         else
             echo "Warning: Mercurial/hg is not installed. Switching to an alternate Subversion repository"
             command -v svn >/dev/null
             if [ $? -eq 0 ];
             then
+                # Disabled temporarily
+                echo "Subversion/svn is currently not supported"
+                exit -1
+
                 echo "Using Subversion/svn to download the source code for swak4Foam"
                 (cd ./rpmBuild/BUILD; svn checkout svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_2.0/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION)
             else
diff --git a/bin/addr2line4Mac.py b/bin/addr2line4Mac.py
index 54a40f1a8..1af9b561f 100755
--- a/bin/addr2line4Mac.py
+++ b/bin/addr2line4Mac.py
@@ -11,6 +11,8 @@ if path.exists(filename):
     fullFile=filename
 
 for v in ["PATH","LD_LIBRARY_PATH"]:
+    if not v in environ:
+        continue
     if not fullFile:
         for d in environ[v].split(':'):
             if path.exists(path.join(d,filename)):
diff --git a/etc/bashrc b/etc/bashrc
index 35c5cc937..2cfef00ca 100755
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -91,7 +91,7 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty
 # Use 'set' and 'unset' to adjust for your environent
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # For AllMake.stage1
-export WM_THIRD_PARTY_USE_BISON_27=1
+#export WM_THIRD_PARTY_USE_BISON_27=1
 #export WM_THIRD_PARTY_USE_CMAKE_322=1
 
 #
diff --git a/etc/cshrc b/etc/cshrc
index b1c46bb64..1d337f444 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -77,7 +77,7 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_DIR/ThirdParty
 # This can be overriden in prefs.sh
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # For AllMake.stage1
-setenv WM_THIRD_PARTY_USE_BISON_27 1
+#setenv WM_THIRD_PARTY_USE_BISON_27 1
 #setenv WM_THIRD_PARTY_USE_CMAKE_322 1
 
 #
diff --git a/src/foam/db/Time/foamTime.C b/src/foam/db/Time/foamTime.C
index 8ea5e35dc..7bae770b5 100644
--- a/src/foam/db/Time/foamTime.C
+++ b/src/foam/db/Time/foamTime.C
@@ -1132,6 +1132,22 @@ Foam::Time& Foam::Time::operator+=(const scalar deltaT)
 
 Foam::Time& Foam::Time::operator++()
 {
+    if (!subCycling_)
+    {
+        if (timeIndex_ == startTimeIndex_)
+        {
+            addProfile2(fo,"functionObjects_.start()");
+
+            functionObjects_.start();
+        }
+        else
+        {
+            addProfile2(fo,"functionObjects_.execute()");
+
+            functionObjects_.execute();
+        }
+    }
+
     deltaT0_ = deltaTSave_;
     deltaTSave_ = deltaT_;