diff --git a/VERSION b/VERSION
index 276af06e0..6830abc60 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
 COLUMNSTORE_VERSION_MAJOR=1
 COLUMNSTORE_VERSION_MINOR=1
-COLUMNSTORE_VERSION_PATCH=0
+COLUMNSTORE_VERSION_PATCH=1
 COLUMNSTORE_VERSION_RELEASE=1
diff --git a/dbcon/joblist/crossenginestep.cpp b/dbcon/joblist/crossenginestep.cpp
index 4a073297e..7f9f3199f 100644
--- a/dbcon/joblist/crossenginestep.cpp
+++ b/dbcon/joblist/crossenginestep.cpp
@@ -189,7 +189,7 @@ void CrossEngineStep::addFcnJoinExp(const vector<execplan::SRCP>& fe)
 
 void CrossEngineStep::addFcnExpGroup1(const boost::shared_ptr<ParseTree>& fe)
 {
-	fFeFilters = fe;
+	fFeFilters.push_back(fe);
 }
 
 
@@ -217,7 +217,7 @@ void CrossEngineStep::makeMappings()
 	for (uint64_t i = 0; i < fColumnCount; ++i)
 		fFe1Column[i] = -1;
 
-	if (fFeFilters != NULL || fFeFcnJoin.size() > 0)
+	if (fFeFilters.size() > 0 || fFeFcnJoin.size() > 0)
 	{
 		const std::vector<uint32_t>& colInFe1 = fRowGroupFe1.getKeys();
 		for (uint64_t i = 0; i < colInFe1.size(); i++)
@@ -499,7 +499,7 @@ void CrossEngineStep::execute()
 
 		// Any functions to evaluate
 		makeMappings();
-		bool doFE1 = ((fFeFcnJoin.size() > 0) || (fFeFilters != NULL));
+		bool doFE1 = ((fFeFcnJoin.size() > 0) || (fFeFilters.size() > 0));
 		bool doFE3 =  (fFeSelects.size() > 0);
 		if (!doFE1 && !doFE3)
 		{
@@ -529,8 +529,20 @@ void CrossEngineStep::execute()
 						setField(fFe1Column[i], rowIn[i], mysql->getFieldLength(i), mysql->getField(i), rowFe1);
 				}
 
-				if (fFeFilters && fFeInstance->evaluate(rowFe1, fFeFilters.get()) == false)
-					continue;
+				if (fFeFilters.size() > 0)
+                {
+                    bool feBreak = false;
+                    for (std::vector<boost::shared_ptr<execplan::ParseTree> >::iterator it = fFeFilters.begin(); it != fFeFilters.end(); it++)
+                    {
+                        if (fFeInstance->evaluate(rowFe1, (*it).get()) == false)
+                        {
+                            feBreak = true;
+                            break;
+                        }
+                    }
+                    if (feBreak)
+    					continue;
+                }
 
 				// evaluate the FE join column
 				fFeInstance->evaluate(rowFe1, fFeFcnJoin);
@@ -592,8 +604,20 @@ void CrossEngineStep::execute()
 						setField(fFe1Column[i], rowIn[i], mysql->getFieldLength(i), mysql->getField(i), rowFe1);
 				}
 
-				if (fFeFilters && fFeInstance->evaluate(rowFe1, fFeFilters.get()) == false)
-					continue;
+				if (fFeFilters.size() > 0)
+                {
+                    bool feBreak = false;
+                    for (std::vector<boost::shared_ptr<execplan::ParseTree> >::iterator it = fFeFilters.begin(); it != fFeFilters.end(); it++)
+                    {
+                        if (fFeInstance->evaluate(rowFe1, (*it).get()) == false)
+                        {
+                            feBreak = true;
+                            break;
+                        }
+                    }
+                    if (feBreak)
+    					continue;
+                }
 
 				// evaluate the FE join column
 				fFeInstance->evaluate(rowFe1, fFeFcnJoin);
diff --git a/dbcon/joblist/crossenginestep.h b/dbcon/joblist/crossenginestep.h
index 82bb8eda3..30b715c25 100644
--- a/dbcon/joblist/crossenginestep.h
+++ b/dbcon/joblist/crossenginestep.h
@@ -211,7 +211,7 @@ protected:
 	std::string fSelectClause;
 
 	// Function & Expression columns
-	boost::shared_ptr<execplan::ParseTree> fFeFilters;
+    std::vector<boost::shared_ptr<execplan::ParseTree> > fFeFilters;
 	std::vector<boost::shared_ptr<execplan::ReturnedColumn> > fFeSelects;
 	std::vector<boost::shared_ptr<execplan::ReturnedColumn> > fFeFcnJoin;
 	std::map<uint32_t, uint32_t> fColumnMap;   // projected key position (k->p)
diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index 0b4b9ba46..494763c35 100755
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -2655,7 +2655,7 @@ ArithmeticColumn* buildArithmeticColumn(Item_func* item, gp_walk_info& gwi, bool
 			}
 		}
 
-		if (!lhs->data() || !rhs->data() || nonSupport)
+		if (nonSupport || !lhs->data() || !rhs->data())
 		{
 			gwi.fatalParseError = true;
 			if (gwi.parseErrorText.empty())
@@ -2688,7 +2688,7 @@ ArithmeticColumn* buildArithmeticColumn(Item_func* item, gp_walk_info& gwi, bool
 				gwi.rcWorkStack.pop();
 			}
 		}
-		if (!rhs->data() || nonSupport)
+		if (nonSupport || !rhs->data())
 		{
 			gwi.fatalParseError = true;
 			if (gwi.parseErrorText.empty())
@@ -3606,6 +3606,10 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
             else
             {
                 rc = buildReturnedColumn(ord_col, gwi, gwi.fatalParseError);
+				if (!rc || gwi.fatalParseError)
+				{
+					return NULL;
+				}
             }
             // 10.2 TODO: direction is now a tri-state flag
 			rc->asc((*order_item)->direction == ORDER::ORDER_ASC ? true : false);
diff --git a/oam/etc/Columnstore.xml b/oam/etc/Columnstore.xml
index 165951ddb..6efa3f8aa 100644
--- a/oam/etc/Columnstore.xml
+++ b/oam/etc/Columnstore.xml
@@ -463,7 +463,6 @@
 		<DataRedundancyStorageType>unassigned</DataRedundancyStorageType>
 		<CoreFileFlag>n</CoreFileFlag>
 		<MySQLPort>3306</MySQLPort>
-		<MySQLPasswordConfig>unassigned</MySQLPasswordConfig>
 		<AmazonDeviceName>/dev/xvd</AmazonDeviceName>
 		<DistributedInstall>y</DistributedInstall>
 	</Installation>
diff --git a/oam/etc/Columnstore.xml.singleserver b/oam/etc/Columnstore.xml.singleserver
index ff466c398..9b3fed686 100644
--- a/oam/etc/Columnstore.xml.singleserver
+++ b/oam/etc/Columnstore.xml.singleserver
@@ -458,7 +458,6 @@
 		<JavaHome>unassigned</JavaHome>
 		<JavaPath>unassigned</JavaPath>
 		<MySQLPort>3306</MySQLPort>
-		<MySQLPasswordConfig>unassigned</MySQLPasswordConfig>
 	</Installation>
 	<ExtentMap>
 		<!--
diff --git a/oam/install_scripts/disable-rep-columnstore.sh b/oam/install_scripts/disable-rep-columnstore.sh
index d15264d28..7824304ad 100644
--- a/oam/install_scripts/disable-rep-columnstore.sh
+++ b/oam/install_scripts/disable-rep-columnstore.sh
@@ -49,7 +49,7 @@ cat /tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-file=$installdir/mysql/my.cnf \
 	--user=root $pwprompt \
-	calpontsys </tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log
+	calpontsys </tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log 2>&1
 
 checkForError
 
@@ -65,7 +65,7 @@ cat /tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-file=$installdir/mysql/my.cnf \
 	--user=root $pwprompt \
-	calpontsys </tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log
+	calpontsys </tmp/idb_disable-rep.sql >>/tmp/disable-rep-status.log 2>&1
 
 checkForError
 
diff --git a/oam/install_scripts/master-rep-columnstore.sh b/oam/install_scripts/master-rep-columnstore.sh
index a4b0992ed..e8ccc4f4d 100644
--- a/oam/install_scripts/master-rep-columnstore.sh
+++ b/oam/install_scripts/master-rep-columnstore.sh
@@ -47,7 +47,7 @@ password="Calpont1"
 #
 echo "Create Replication User $repUser for node $hostipaddr" >>/tmp/master-rep-status-$hostipaddr.log
 cat >/tmp/idb_master-rep.sql <<EOD
-CREATE USER '$repUser'@'$hostipaddr' IDENTIFIED BY '$password';
+CREATE USER IF NOT EXISTS '$repUser'@'$hostipaddr' IDENTIFIED BY '$password';
 GRANT REPLICATION SLAVE ON *.* TO '$repUser'@'$hostipaddr';
 EOD
 
@@ -55,7 +55,7 @@ cat /tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
 $installdir/mysql/bin/mysql \
 	--defaults-file=$installdir/mysql/my.cnf \
 	--user=root $pwprompt \
-	calpontsys </tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
+	calpontsys </tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log 2>&1
 
 checkForError
 
@@ -73,7 +73,7 @@ cat /tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
 $installdir/mysql/bin/mysql \
 	--defaults-file=$installdir/mysql/my.cnf \
 	--user=root $pwprompt \
-	calpontsys </tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
+	calpontsys </tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log 2>&1
 
 checkForError
 
@@ -89,7 +89,7 @@ cat /tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
 $installdir/mysql/bin/mysql \
 	--defaults-file=$installdir/mysql/my.cnf \
 	--user=root $pwprompt \
-	calpontsys </tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log
+	calpontsys </tmp/idb_master-rep.sql >>/tmp/master-rep-status-$hostipaddr.log 2>&1
 
 checkForError
 
diff --git a/oam/install_scripts/module_installer.sh b/oam/install_scripts/module_installer.sh
index c989865e3..514943989 100755
--- a/oam/install_scripts/module_installer.sh
+++ b/oam/install_scripts/module_installer.sh
@@ -155,7 +155,13 @@ if [ $module = "um" ] || ( [ $module = "pm" ] && [ $PMwithUM = "y" ] ) || [ $Ser
 	    exit 1
 	fi
 	echo "Run post-mysql-install"
-	$COLUMNSTORE_INSTALL_DIR/bin/post-mysql-install --installdir=$COLUMNSTORE_INSTALL_DIR > /tmp/post-mysql-install.log 2>&1
+	
+	password=`$COLUMNSTORE_INSTALL_DIR/bin/getMySQLpw`
+	if [ $password = "unassigned" ]; then
+	    password=""
+	fi
+	
+	$COLUMNSTORE_INSTALL_DIR/bin/post-mysql-install --installdir=$COLUMNSTORE_INSTALL_DIR --password=$password > /tmp/post-mysql-install.log 2>&1
         if [ $? -ne 0 ]; then
             echo "ERROR: post-mysql-install failed: check /tmp/post-mysql-install.log"
             exit 1
diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install
index 8c5fb2117..9bf703751 100755
--- a/oam/install_scripts/post-install
+++ b/oam/install_scripts/post-install
@@ -95,39 +95,32 @@ fi
 # softlink for libperl.sp, used by cplogger
 $SUDO ln -s /usr/lib64/perl5/CORE/libperl.so /usr/lib64/libperl.so >/dev/null 2>&1
 
-#setup .bashrc
-if [ $user = "root" ]; then
-	bashFile=/root/.bashrc
-else
-	bashFile=$HOME/.bashrc
-fi
-
-touch ${bashFile}
-/bin/cp -f ${bashFile} ${bashFile}.columnstoreSave > /dev/null 2>&1
-
-if [ $user != "root" ]; then
-
-	egrep -qs 'MariaDB Columnstore Non-Root' ${bashFile}
-	rc1=$?
-	if [ $rc1 -ne 0 ]; then
-        	echo " " >> ${bashFile}
-		echo "# MariaDB Columnstore Non-Root Environment Variables" >> ${bashFile}
-        	echo "export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR" >> ${bashFile}
-        	echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql" >> ${bashFile}
-        	. ${bashFile}
-	fi
-fi
+#setup profile files
+profileFileAlias=/etc/profile.d/columnstoreAlias.sh
+profileFileEnv=/etc/profile.d/columnstoreEnv.sh
 
 if [ $installdir != "/usr/local/mariadb/columnstore" ]; then
         sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstoreAlias
 fi
-egrep -qs 'MariaDB Columnstore Database Platform Alias Commands' ${bashFile}
-rc1=$?
-egrep -qs 'MariaDB Columnstore Alias Commands' ${bashFile}
-rc2=$?
-if [ $rc1 -ne 0 -a $rc2 -ne 0 ]; then
-        cat $installdir/bin/columnstoreAlias >> ${bashFile}
-        echo " " >> ${bashFile}
+
+if [ $user != "root" ]; then
+	sudo touch $profileFileEnv
+	sudo chmod 666 $profileFileEnv
+	egrep -qs 'MariaDB Columnstore Non-Root' ${profileFileEnv}
+	rc1=$?
+	if [ $rc1 -ne 0 ]; then
+        	sudo echo " " >> ${profileFileEnv}
+		sudo echo "# MariaDB Columnstore Non-Root Environment Variables" >> ${profileFileEnv}
+        	sudo echo "export COLUMNSTORE_INSTALL_DIR=$COLUMNSTORE_INSTALL_DIR" >> ${profileFileEnv}
+        	sudo echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$COLUMNSTORE_INSTALL_DIR/lib:$COLUMNSTORE_INSTALL_DIR/mysql/lib/mysql" >> ${profileFileEnv}
+        	. ${profileFileEnv}
+	fi
+	
+	sudo /bin/cp -f $installdir/bin/columnstoreAlias $profileFileAlias
+	sudo chmod 666 $profileFileAlias
+else
+	/bin/cp -f $installdir/bin/columnstoreAlias $profileFileAlias
+	chmod 644 $profileFileAlias
 fi
 
 cd /
@@ -184,9 +177,9 @@ $installdir/bin/clearShm  > /dev/null 2>&1
 systemctl=`which systemctl 2>/dev/null`
 
 #check and create rc.local file if missing
-if [ ! -f /etc/rc.local ]; then
+if [ ! -f /etc/rc.d/rc.local ]; then
 	printf '%s\n' '#!/bin/bash' "#" | $SUDO tee -a /etc/rc.local > /dev/null 2>&1
-    	$SUDO chmod +x /etc/rc.local
+    	$SUDO chmod +x /etc/rc.d/rc.local
     
     if [ -n "$systemctl" ]; then
 	systemctl restart rc-local >/dev/null 2>&1
@@ -248,7 +241,7 @@ else
 	$SUDO chmod 777 /var/lock/subsys > /dev/null 2>&1
 	$SUDO rm -f /var/lock/subsys/mysql-Columnstore
 	$SUDO chmod 666 /etc/fstab
-	$SUDO chmod 777 /etc/rc.local
+	$SUDO chmod 777 /etc/rc.d/rc.local
 fi
 
 # install Columnstore Log Rotate File
@@ -264,24 +257,6 @@ fi
 #backup copy of Alarm Config File
 /bin/cp -f $installdir/etc/AlarmConfig.xml $installdir/etc/AlarmConfig.xml.installSave > /dev/null 2>&1
 
-#setup alias commands
-eval userhome=~$user
-bashFile=$userhome/.bashrc
-touch ${bashFile}
-if [ $installdir != "/usr/local/mariadb/columnstore" ]; then
-	sed -i -e s@/usr/local/mariadb/columnstore@$installdir@g $installdir/bin/columnstoreAlias
-fi
-egrep -qs 'MariaDB Columnstore Database Platform Alias Commands' ${bashFile}
-rc1=$?
-egrep -qs 'MariaDB Columnstore Alias Commands' ${bashFile}
-rc2=$?
-if [ $rc1 -ne 0 -a $rc2 -ne 0 ]; then
-	rm -f ${bashFile}.columnstoreSave
-	cp ${bashFile} ${bashFile}.columnstoreSave >/dev/null 2>&1
-	cat $installdir/bin/columnstoreAlias >> ${bashFile}
-	echo " " >> ${bashFile}
-fi
-
 #check and get amazon env variables
 aws=`which aws 2>/dev/null`
 if [ -z "aws" ]; then
diff --git a/oam/install_scripts/pre-uninstall b/oam/install_scripts/pre-uninstall
index 9e2c0573e..73efa387f 100755
--- a/oam/install_scripts/pre-uninstall
+++ b/oam/install_scripts/pre-uninstall
@@ -33,12 +33,6 @@ for arg in "$@"; do
 	fi
 done
 
-if [ $user = "root" ]; then
-	. /root/.bashrc
-else
-	. $HOME/.bashrc
-fi
-
 #stop services
 $installdir/bin/columnstore stop > /dev/null 2>&1
 $installdir/myql/columnstore-Mysql stop > /dev/null 2>&1
@@ -162,15 +156,11 @@ else
 	$SUDO rm -f /etc/defaults/columnstore
 fi
 
-#cleanup .bashrc	
+#cleanup profile file
 if [ $user = "root" ]; then
-        if test -f /root/.bashrc.columnstoreSave ; then
-                mv -f /root/.bashrc.columnstoreSave /root/.bashrc > /dev/null 2>&1
-        fi
+	rm -f /etc/profile.d/columnstore*
 else
-        if test -f $HOME/.bashrc.columnstoreSave ; then
-                mv -f /home/$user/.bashrc.columnstoreSave /home/$user/.bashrc > /dev/null 2>&1
-        fi
+	$SUDO rm -f /etc/profile.d/columnstore*
 fi
 
 #tell user to run post configure script
diff --git a/oam/install_scripts/rsync.sh b/oam/install_scripts/rsync.sh
index d14b5eeda..7bbe29641 100755
--- a/oam/install_scripts/rsync.sh
+++ b/oam/install_scripts/rsync.sh
@@ -14,9 +14,12 @@ set DEBUG [lindex $argv 3]
 log_user $DEBUG
 spawn -noecho /bin/bash
 
-exec whoami >/tmp/whoami.tmp
-set USERNAME [exec cat /tmp/whoami.tmp]
-exec rm -f /tmp/whoami.tmp
+if {[info exists env(USER)]} {
+    set USERNAME $env(USER)
+} else {
+    set USERNAME "root"
+}
+
 
 if { $PASSWORD == "ssh" } {
 	set PASSWORD ""
@@ -43,13 +46,36 @@ expect {
 	-re "passphrase" { send "$PASSWORD\n" }
 	-re "failed" { send_user "           FAILED: Failure, check tmp log\n" ; exit 1 }
 	-re "Permission denied" { send_user "           FAILED: Invalid password\n" ; exit 1 }
-	-re "total size" { exit 0 }
+	-re "total size" {} abort
 }
 expect {
 	-re "failed" { send_user "           FAILED: Failure, check tmp log\n" ; exit 1 }
 	-re "Permission denied" { send_user "           FAILED: Invalid password\n" ; exit 1 }
-	-re "total size" { exit 0 }
+	-re "total size" {} abort
 	
 }
 
+set HOME "$env(HOME)"
+
+set COMMAND "rsync -vopgr -e ssh $HOME/.my.cnf $USERNAME@$SERVER:$HOME/"
+
+#
+# run command
+#
+set timeout 20
+send "$COMMAND\n"
+expect {
+        -re "word: " { send "$PASSWORD\n" }
+        -re "passphrase" { send "$PASSWORD\n" }
+	-re "total size" {} abort
+	-re "failed" { exit 0 }
+        timeout { exit 0 }
+}
+expect {
+	-re "total size" {} abort
+        -re "failed" { exit 0 }
+        timeout { exit 0 }
+}
+
+
 exit 0
diff --git a/oam/install_scripts/slave-rep-columnstore.sh b/oam/install_scripts/slave-rep-columnstore.sh
index efd6609f2..e3318f8a2 100644
--- a/oam/install_scripts/slave-rep-columnstore.sh
+++ b/oam/install_scripts/slave-rep-columnstore.sh
@@ -60,7 +60,9 @@ cat /tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-file=$installdir/mysql/my.cnf \
 	--user=root $pwprompt \
-	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
+	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log 2>&1
+
+checkForError
 
 #
 # Run Change Master Command
@@ -81,7 +83,9 @@ cat /tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-file=$installdir/mysql/my.cnf \
 	--user=root $pwprompt \
-	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
+	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log 2>&1
+
+checkForError
 
 #
 # Run start slave command
@@ -95,7 +99,9 @@ cat /tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-file=$installdir/mysql/my.cnf \
 	--user=root $pwprompt \
-	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
+	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log 2>&1
+
+checkForError
 
 #
 # Run SHOW SLAVE STATUS
@@ -109,7 +115,7 @@ cat /tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
 $installdir/mysql/bin/mysql \
 	--defaults-file=$installdir/mysql/my.cnf \
 	--user=root $pwprompt \
-	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log
+	calpontsys </tmp/idb_slave-rep.sql >>/tmp/slave-rep-status.log 2>&1
 
 checkForError
 
diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index 8bfc10033..9a92ec9c3 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -8768,22 +8768,10 @@ namespace oam
 	* purpose:	check and get mysql user password
 	*
 	******************************************************************************************/
-	std::string Oam::getMySQLPassword(bool bypassConfig)
+	std::string Oam::getMySQLPassword()
 	{
-		if ( !bypassConfig )
-		{
-			string MySQLPasswordConfig;
-			try {
-				getSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
-			}
-			catch(...) {
-				MySQLPasswordConfig = "n";
-			}
+		string mysqlUser = "root";
 		
-			if ( MySQLPasswordConfig == "n" )
-				return oam::UnassignedName;
-		}
-
 		string USER = "root";
 		char* p= getenv("USER");
 		if (p && *p)
@@ -8796,10 +8784,15 @@ namespace oam
 
 		string fileName = HOME + "/.my.cnf";
 		
+		writeLog("getMySQLPassword: checking: " + fileName, LOG_TYPE_DEBUG);
+
 		ifstream file (fileName.c_str());
 
 		if (!file)
+		{
+			writeLog("getMySQLPassword: doesn't exist: " + fileName, LOG_TYPE_DEBUG);
 			exceptionControl("getMySQLPassword", API_FILE_OPEN_ERROR);
+		}
 	
 		char line[400];
 		string buf;
@@ -8807,8 +8800,8 @@ namespace oam
 		while (file.getline(line, 400))
 		{
 			buf = line;
-	
-			string::size_type pos = buf.find(USER,0);
+			string::size_type pos = buf.find(mysqlUser,0);
+
 			if (pos != string::npos)
 			{
 				file.getline(line, 400);
@@ -8820,24 +8813,23 @@ namespace oam
 					string::size_type pos1 = buf.find("=",pos);
 					if (pos1 != string::npos) {
 						//password found
-						if ( bypassConfig )
-						{
-							try {
-								setSystemConfig("MySQLPasswordConfig", "y");
-							}
-							catch(...) {}
-						}
 
-						string password = buf.substr(pos1+2, 80);
+						string password = buf.substr(pos1+1, 80);
+						password.erase(remove_if(password.begin(), password.end(), ::isspace), password.end());
 
+						writeLog("getMySQLPassword: password found", LOG_TYPE_DEBUG);
 						return password;
 					}
 				}
+				
+				break;
 			}
 		}
 		file.close();
 
+		writeLog("getMySQLPassword: no password found", LOG_TYPE_DEBUG);
 		exceptionControl("getMySQLPassword", API_FAILURE);
+		
 		return oam::UnassignedName;
 	}
 
diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h
index db670ff70..68c6400c6 100644
--- a/oam/oamcpp/liboamcpp.h
+++ b/oam/oamcpp/liboamcpp.h
@@ -33,6 +33,7 @@
 #include <limits.h>
 #include <sstream>
 #include <vector>
+#include <algorithm>
 #ifdef __linux__
 #include <sys/sysinfo.h>
 #include <netdb.h>
@@ -2468,7 +2469,7 @@ namespace oam
 
 		/** @brief check and get mysql user password
 		*/
-		EXPORT std::string getMySQLPassword(bool bypassConfig = false);
+		EXPORT std::string getMySQLPassword();
 
 		/** @brief update fstab with dbroot mounts
 		*/
diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index 2c07af23a..0671bff19 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -3416,29 +3416,13 @@ int processCommand(string* arguments)
 			}
 
 		string MySQLRep;
-		string MySQLPasswordConfig;
 		try {
 			oam.getSystemConfig("MySQLRep", MySQLRep);
-			oam.getSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
 		}
 		catch(...) {}
 	
-		if ( MySQLRep == "y" && MySQLPasswordConfig == oam::UnassignedName ) {
-			cout << endl;
-			string prompt = "MariaDB ColumnStore Replication is enabled, is there a 'MariaDB ColumnStore' Password configured in " + HOME + "/.my.cnf  (y,n): ";
-			MySQLPasswordConfig = dataPrompt(prompt);
-		}
-
-		if ( MySQLPasswordConfig != "y" )
-			MySQLPasswordConfig = "n";
-
-		try {
-			oam.setSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
-		}
-		catch(...) {}
-
-            try
-            {
+		try
+		{
                 cout << endl << "   Check for active transactions" << endl;
 
                 if (!bDBRMReady ||
@@ -4990,6 +4974,12 @@ int processCommand(string* arguments)
 
         case 46: // enableReplication
         {
+		if ( SingleServerInstall == "y" ) {
+		    // exit out since not on single-server install
+		    cout << endl << "**** enableReplication Failed : not supported on a Single-Server type installs  " << endl;
+		    break;
+		}
+
 		string MySQLRep;
 		try {
 			oam.getSystemConfig("MySQLRep", MySQLRep);
@@ -5015,26 +5005,6 @@ int processCommand(string* arguments)
 		if ( password == "")
 			password = oam::UnassignedName;
 
-		string MySQLPasswordConfig;
-		try {
-			oam.getSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
-		}
-		catch(...) {}
-	
-		if ( MySQLPasswordConfig == oam::UnassignedName ) {
-			cout << endl;
-			string prompt = "Is there a 'MariaDB ColumnStore' Password configured on the MariaDB ColumnStore Front-end Modules in " + HOME + "/.my.cnf (y,n): ";
-			MySQLPasswordConfig = dataPrompt(prompt);
-		}
-
-		if ( MySQLPasswordConfig != "y" )
-			MySQLPasswordConfig = "n";
-
-		try {
-			oam.setSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
-		}
-		catch(...) {}
-
 		//set flag
 		try {
 			oam.setSystemConfig("MySQLRep", "y");
@@ -6117,6 +6087,12 @@ int processCommand(string* arguments)
 
         case 51: // disableReplication
         {
+		if ( SingleServerInstall == "y" ) {
+		    // exit out since not on single-server install
+		    cout << endl << "**** disableReplication Failed : not supported on a Single-Server type installs  " << endl;
+		    break;
+		}
+
 		string MySQLRep;
 		try {
 			oam.getSystemConfig("MySQLRep", MySQLRep);
@@ -6130,26 +6106,6 @@ int processCommand(string* arguments)
 				break;
 		}
 
-		string MySQLPasswordConfig;
-		try {
-			oam.getSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
-		}
-		catch(...) {}
-	
-		if ( MySQLPasswordConfig == oam::UnassignedName ) {
-			cout << endl;
-			string prompt = "Is there a 'MariaDB ColumnStore' Password configured on the MariaDB ColumnStore Front-end Modules in " + HOME + "/.my.cnf (y,n): ";
-			MySQLPasswordConfig = dataPrompt(prompt);
-		}
-
-		if ( MySQLPasswordConfig != "y" )
-			MySQLPasswordConfig = "n";
-
-		try {
-			oam.setSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
-		}
-		catch(...) {}
-
 		//set flag
 		try {
 			oam.setSystemConfig("MySQLRep", "n");
diff --git a/oamapps/postConfigure/getMySQLpw.cpp b/oamapps/postConfigure/getMySQLpw.cpp
index 4a2440e1c..c47774af5 100644
--- a/oamapps/postConfigure/getMySQLpw.cpp
+++ b/oamapps/postConfigure/getMySQLpw.cpp
@@ -57,30 +57,59 @@ int main(int argc, char *argv[])
 {
 	Oam oam;
 
-	//get mysql user password
-	string mysqlpw = oam::UnassignedName;
-	try {
-		mysqlpw = oam.getMySQLPassword();
-	}
-	catch (...)
+	string USER = "root";
+	char* p= getenv("USER");
+	if (p && *p)
+		USER = p;
+
+	string HOME = "/root";
+	p= getenv("HOME");
+	if (p && *p)
+		HOME = p;
+
+	string fileName = HOME + "/.my.cnf";
+	
+	ifstream file (fileName.c_str());
+
+	if (!file)
 	{
-		cout << oam::UnassignedName << endl;
-		exit (1);
+	    cout << oam::UnassignedName << endl;
+	    exit (1);
 	}
 
-	if ( mysqlpw == oam::UnassignedName ) {
-		cout << oam::UnassignedName << endl;
-		exit (1);
+	char line[400];
+	string buf;
+
+	while (file.getline(line, 400))
+	{
+		buf = line;
+
+		string::size_type pos = buf.find("root",0);
+		if (pos != string::npos)
+		{
+			file.getline(line, 400);
+			buf = line;
+
+			pos = buf.find("password",0);
+			if (pos != string::npos)
+			{
+				string::size_type pos1 = buf.find("=",pos);
+				if (pos1 != string::npos) {
+					//password found
+
+					string password = buf.substr(pos1+2, 80);
+
+					cout << password << endl;
+					exit (0);
+				}
+			}
+		}
 	}
+	file.close();
+	
+	cout << oam::UnassignedName << endl;
 
-	cout << mysqlpw << endl;
-
-	try {
-		oam.setSystemConfig("MySQLPasswordConfig", "y");
-	}
-	catch(...) {}
-
-	exit (0);
+	exit (1);
 
 }
 // vim:ts=4 sw=4:
diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp
index 8638bebba..0bce99a7c 100644
--- a/oamapps/postConfigure/helpers.cpp
+++ b/oamapps/postConfigure/helpers.cpp
@@ -874,29 +874,6 @@ bool writeConfig( Config* sysConfig )
 	return false;
 }
 
-std::string getmysqlpw(std::string logFile)
-{
-	ifstream oldFile (logFile.c_str());
-	if (oldFile) {
-		char line[200];
-		string buf;
-		while (oldFile.getline(line, 200))
-		{
-			buf = line;
-			string::size_type pos = buf.find("mysqlpw=",0);
-			if (pos != string::npos)
-			{
-				string mysqlpw = buf.substr(pos+8, 80);
-//				unlink(logFile);
-				return mysqlpw;
-			}
-		}
-	}
-
-	return oam::UnassignedName;
 }
 
 
-
-}
-
diff --git a/oamapps/postConfigure/helpers.h b/oamapps/postConfigure/helpers.h
index 61de9bb4b..652c86958 100644
--- a/oamapps/postConfigure/helpers.h
+++ b/oamapps/postConfigure/helpers.h
@@ -46,7 +46,6 @@ extern bool writeConfig(Config* sysConfig);
 extern void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string USER, std::string password, ChildModuleList childmodulelist, int IserverTypeInstall, bool pmwithum);
 extern const char* callReadline(string prompt);
 extern void callFree(const char* );
-extern std::string getmysqlpw(std::string logFile);
 
 }
 
diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp
index 831fccefe..76a479681 100644
--- a/oamapps/postConfigure/installer.cpp
+++ b/oamapps/postConfigure/installer.cpp
@@ -809,12 +809,23 @@ int main(int argc, char *argv[])
 
 		cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << endl;
 		cout << "Enter 'mcsadmin' to access the MariaDB ColumnStore Admin console" << endl << endl;
+		
+		cout << "NOTE: The MariaDB ColumnStore Alias Commands are in /etc/profile.d/columnstoreAlias" << endl << endl;
 	}
 	else
 	{
 		cout << " FAILED" << endl;
 		cout << endl << "ERROR: MariaDB ColumnStore Process failed to start, check log files in /var/log/mariadb/columnstore" << endl;
+		cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;
+
+		cout << ". " + installDir + "/bin/columnstoreAlias" << endl << endl;
+
+		cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << endl;
+		cout << "Enter 'mcsadmin' to access the MariaDB ColumnStore Admin console" << endl << endl;
+		exit (1);
 	}
+	
+	exit (0);
 }
 
 
diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index 42ae1e765..6eab4c203 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -23,7 +23,7 @@
 * List of files being updated by post-install configure:
 *		mariadb/columnstore/etc/Columnstore.xml
 *		mariadb/columnstore/etc/ProcessConfig.xml
-*		/etc/rc.local
+*		/etc/rc.d/rc.local
 *		
 ******************************************************************************************/
 /**
@@ -191,7 +191,7 @@ string installDir;
 string HOME = "/root";
 
 extern string pwprompt;
-string mysqlpw = " ";
+string mysqlpw = oam::UnassignedName;
 
 extern const char* pcommand;
 extern string prompt;
@@ -458,14 +458,6 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-        //if binary install, then run post-install just in case the user didnt run it
-    	if ( EEPackageType == "binary" )
-    	{
-        	//run post install
-        	cmd = installDir + "/bin/post-install --installdir=" + installDir + " > /dev/null 2>&1";
-        	system(cmd.c_str());
-    	}
-
 	//check for local ip address as pm1
 	ModuleConfig moduleconfig;
 
@@ -592,11 +584,6 @@ int main(int argc, char *argv[])
 		{}
 	}
 
-	try {
-		oam.setSystemConfig("MySQLPasswordConfig", oam::UnassignedName);
-	}
-	catch(...) {}
-
 	//check for non-Distributed Install
 	if ( nonDistribute )
 	{
@@ -618,6 +605,13 @@ int main(int argc, char *argv[])
 		nonDistribute = true;
 	}
 	
+	// setup to start on reboot, for non-root amazon installs
+	if ( !rootUser )
+	{
+	    system("sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.d/rc.local >/dev/null 2>&1");
+	    system("sudo chmod 777 /etc/rc.d/rc.local >/dev/null 2>&1");
+	}
+	
 	cout << endl;
 
 	cout << "===== Setup System Server Type Configuration =====" << endl << endl;
@@ -1071,10 +1065,6 @@ int main(int argc, char *argv[])
 			cout << "ERROR: Failed trying to update MariaDB ColumnStore System Configuration file" << endl; 
 			exit(1);
 		}
-		
-		// setup to start on reboot
-		system("sudo sed -i -e 's/#sudo runuser/sudo runuser/g' /etc/rc.d/rc.local >/dev/null 2>&1");
-		system("sudo chmod 777 /etc/rc.d/rc.local >/dev/null 2>&1");
 	}
 	
 	if ( pmwithum )
@@ -2947,143 +2937,149 @@ int main(int argc, char *argv[])
 							string temppwprompt = pwprompt;
 							if ( pwprompt == " " )
 								temppwprompt = "none";
+              
+              //run remote installer script
+					    cmd = installDir + "/bin/package_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " initial " + AmazonInstall + " " + EEPackageType + " " + nodeps + " " + remote_installer_debug + " " + debug_logfile;
 
-							//run remote installer script
-							cmd = installDir + "/bin/package_installer.sh " + remoteModuleName + " " + remoteModuleIP + " " + password + " " + version + " initial " + AmazonInstall + " " + EEPackageType + " " + nodeps + " " + remote_installer_debug + " " + debug_logfile;
+					    if ( thread_remote_installer ) {
+						    thr_data[thread_id].command = cmd;
 
-							if ( thread_remote_installer ) {
-								thr_data[thread_id].command = cmd;
+						    int status = pthread_create (&thr[thread_id], NULL, (void*(*)(void*)) &remoteInstallThread, &thr_data[thread_id]);
+				    
+						    if ( status != 0 )
+						    {
+							    cout << "remoteInstallThread failed for " << remoteModuleName << ", exiting" << endl;
+							    exit (1);
+						    }
+						    thread_id++;
+					    }
+					    else
+					    {
+						    int rtnCode = system(cmd.c_str());
+						    if (WEXITSTATUS(rtnCode) != 0) {
+							    cout << endl << "Error returned from package_installer.sh" << endl;
+							    exit(1);
+						    }
 
-								int status = pthread_create (&thr[thread_id], NULL, (void*(*)(void*)) &remoteInstallThread, &thr_data[thread_id]);
+						    //check for mysql password on remote UM
+/*						    if ( pwprompt == " " ) {
+							    //start mysqld
+							    cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/mysql-Columnstore start'";
+							    int rtnCode = system(cmd.c_str());
+							    if (WEXITSTATUS(rtnCode) != 0) {
+								    cout << endl << "Error returned from mysql-Columnstore start" << endl;
+								    exit(1);
+							    }
 
-								if ( status != 0 )
-								{
-									cout << "remoteInstallThread failed for " << remoteModuleName << ", exiting" << endl;
-									exit (1);
-								}
-								thread_id++;
-							}
-							else
-							{
-								int rtnCode = system(cmd.c_str());
-								if (WEXITSTATUS(rtnCode) != 0) {
-									cout << endl << "Error returned from package_installer.sh" << endl;
-									exit(1);
-								}
+							    //try to login
+							    cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/bin/mysql --defaults-file=" + installDir + "/mysql/my.cnf -u root " + pwprompt + " -e status' 1 > /tmp/idbmysql.log 2>&1";
+							    rtnCode = system(cmd.c_str());
+							    if (WEXITSTATUS(rtnCode) != 0) {
+								    cout << endl << "Error returned from remote_command.sh" << endl;
+								    exit(1);
+							    }
+    
+							    if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR .my.cnf") ) {
+								    // password needed check and get password from remote UM
+								    cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "bin/getMySQLpw > /tmp/mysqlpw.log 2>&1";
+								    rtnCode = system(cmd.c_str());
+								    if (WEXITSTATUS(rtnCode) != 0) {
+									    cout << endl << "MariaDB ColumnStore login failure, MySQL Root password is set." << endl;
+									    cout <<  "Need MariaDB ColumnStore password configuration file " + HOME + "/.my.cnf on " << remoteModuleName << endl;
+									    exit(1);
+								    }
 
-								//check for mysql password on remote UM
-								if ( pwprompt == " " ) {
-									//start mysqld
-									cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/mysql-Columnstore start'";
-									int rtnCode = system(cmd.c_str());
-									if (WEXITSTATUS(rtnCode) != 0) {
-										cout << endl << "Error returned from mysql-Columnstore start" << endl;
-										exit(1);
-									}
+								    //get password from local tmp file
+								    try {
+									mysqlpw = oam.getMySQLPassword();
+								    }
+								    catch(...)
+								    {
+									mysqlpw = oam::UnassignedName;
+								    }
+								    
+								    if ( mysqlpw != oam::UnassignedName )
+								    {
+									    mysqlpw = "'" + mysqlpw + "'";
+									    pwprompt = "--password=" + mysqlpw;
+								    }
 
-									//try to login
-									cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/bin/mysql --defaults-file=" + installDir + "/mysql/my.cnf -u root " + pwprompt + " -e status' 1 > /tmp/idbmysql.log 2>&1";
-									rtnCode = system(cmd.c_str());
-									if (WEXITSTATUS(rtnCode) != 0) {
-										cout << endl << "Error returned from remote_command.sh" << endl;
-										exit(1);
-									}
+								    cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/bin/mysql --defaults-file=" + installDir + "/mysql/my.cnf -u root " + pwprompt + " -e status' 1 > /tmp/idbmysql.log 2>&1";
+								    rtnCode = system(cmd.c_str());
+								    if (WEXITSTATUS(rtnCode) != 0) {
+									    cout << endl << "MariaDB ColumnStore  login failure, password mismatch in " + HOME + ".my.cnf on " << remoteModuleName << endl;
+									    exit(1);
+								    }
+							    }
+							    else
+							    {
+								    if (!oam.checkLogStatus("/tmp/idbmysql.log", "Columnstore") ) {
+									    cout << endl << "ERROR: MariaDB ColumnStore runtime error, exit..." << endl << endl;
+									    system("cat /tmp/idbmysql.log");
+									    exit (1);
+								    }
+								    else
+								    {
+									    cout << endl << "Additional MariaDB ColumnStore Installation steps Successfully Completed on '" + remoteModuleName + "'" << endl << endl;
 
-									if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR .my.cnf") ) {
-										// password needed check and get password from remote UM
-										cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "bin/getMySQLpw > /tmp/mysqlpw.log 2>&1";
-										rtnCode = system(cmd.c_str());
-										if (WEXITSTATUS(rtnCode) != 0) {
-											cout << endl << "MariaDB ColumnStore login failure, MySQL Root password is set." << endl;
-											cout <<  "Need MariaDB ColumnStore password configuration file " + HOME + "/.my.cnf on " << remoteModuleName << endl;
-											exit(1);
-										}
+									    cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/mysql-Columnstore stop'";
+									    int rtnCode = system(cmd.c_str());
+									    if (WEXITSTATUS(rtnCode) != 0) {
+										    cout << endl << "Error returned from mysql-Columnstore stop" << endl;
+										    exit(1);
+									    }
+									    unlink("/tmp/idbmysql.log");
+									    break;
+								    }
+							    }
+    
+							    //re-run post-mysql-install with password
+							    cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/bin/post-mysql-install " + pwprompt + "' < /tmp/post-mysql-install.log";
+							    rtnCode = system(cmd.c_str());
+							    if (WEXITSTATUS(rtnCode) != 0) {
+								    cout << endl << "Error returned from post-mysql-install, check /tmp/post-mysql-install.log" << endl;
+								    exit(1);
+							    }
+							    else
+								    cout << endl << "post-mysql-install Successfully Completed" << endl;
+						    }
+*/					    }
+				    }
+				    else
+				    {	// do a binary package install
+					    string binservertype = serverTypeInstall;
+					    if ( pmwithum )
+						    binservertype = "pmwithum";
 
-										//get password from local tmp file
-										mysqlpw = getmysqlpw("/tmp/mysqlpw.log");
+					    cmd = installDir + "/bin/binary_installer.sh " + remoteModuleName + " " +
+						    remoteModuleIP + " " + password + " " + columnstorePackage + " " + installType + " " + AmazonInstall + " " + remote_installer_debug +
+						    " " + installDir + " " + debug_logfile;
+					    
+					    if ( thread_remote_installer ) {
+						    thr_data[thread_id].command = cmd;
 
-										if ( mysqlpw != oam::UnassignedName )
-										{
-											mysqlpw = "'" + mysqlpw + "'";
-											pwprompt = "--password=" + mysqlpw;
-										}
-
-										cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/bin/mysql --defaults-file=" + installDir + "/mysql/my.cnf -u root " + pwprompt + " -e status' 1 > /tmp/idbmysql.log 2>&1";
-										rtnCode = system(cmd.c_str());
-										if (WEXITSTATUS(rtnCode) != 0) {
-											cout << endl << "MariaDB ColumnStore  login failure, password mismatch in " + HOME + ".my.cnf on " << remoteModuleName << endl;
-											exit(1);
-										}
-									}
-									else
-									{
-										if (!oam.checkLogStatus("/tmp/idbmysql.log", "Columnstore") ) {
-											cout << endl << "ERROR: MariaDB ColumnStore runtime error, exit..." << endl << endl;
-											system("cat /tmp/idbmysql.log");
-											exit (1);
-										}
-										else
-										{
-											cout << endl << "Additional MariaDB ColumnStore Installation steps Successfully Completed on '" + remoteModuleName + "'" << endl << endl;
-
-											cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/mysql-Columnstore stop'";
-											int rtnCode = system(cmd.c_str());
-											if (WEXITSTATUS(rtnCode) != 0) {
-												cout << endl << "Error returned from mysql-Columnstore stop" << endl;
-												exit(1);
-											}
-											unlink("/tmp/idbmysql.log");
-											break;
-										}
-									}
-
-									//re-run post-mysql-install with password
-									cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/bin/post-mysql-install " + pwprompt + "' < /tmp/post-mysql-install.log";
-									rtnCode = system(cmd.c_str());
-									if (WEXITSTATUS(rtnCode) != 0) {
-										cout << endl << "Error returned from post-mysql-install, check /tmp/post-mysql-install.log" << endl;
-										exit(1);
-									}
-									else
-										cout << endl << "post-mysql-install Successfully Completed" << endl;
-								}
-							}
-						}
-						else
-						{	// do a binary package install
-							string binservertype = serverTypeInstall;
-							if ( pmwithum )
-								binservertype = "pmwithum";
-
-							cmd = installDir + "/bin/binary_installer.sh " + remoteModuleName + " " +
-								remoteModuleIP + " " + password + " " + columnstorePackage + " " + installType + " " + AmazonInstall + " " + remote_installer_debug +
-								" " + installDir + " " + debug_logfile;
-
-							if ( thread_remote_installer ) {
-								thr_data[thread_id].command = cmd;
-
-								int status = pthread_create (&thr[thread_id], NULL, (void*(*)(void*)) &remoteInstallThread, &thr_data[thread_id]);
-
-								if ( status != 0 )
-								{
-									cout << "remoteInstallThread failed for " << remoteModuleName << ", exiting" << endl;
-									exit (1);
-								}
-
-								thread_id++;
-							}
-							else
-							{
-								int rtnCode = system(cmd.c_str());
-								if (WEXITSTATUS(rtnCode) != 0) {
-									cout << endl << "Error returned from package_installer.sh" << endl;
-									exit(1);
-								}
-							}
-						}
-					}
-					else
-					{
+						    int status = pthread_create (&thr[thread_id], NULL, (void*(*)(void*)) &remoteInstallThread, &thr_data[thread_id]);
+				    
+						    if ( status != 0 )
+						    {
+							    cout << "remoteInstallThread failed for " << remoteModuleName << ", exiting" << endl;
+							    exit (1);
+						    }
+				    
+						    thread_id++;
+					    }
+					    else
+					    {
+						    int rtnCode = system(cmd.c_str());
+						    if (WEXITSTATUS(rtnCode) != 0) {
+							    cout << endl << "Error returned from package_installer.sh" << endl;
+							    exit(1);
+						    }
+					    }
+				    }
+				}
+				else
+				{
 						if ( (remoteModuleType == "pm" && IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM) ||
 							(remoteModuleType == "pm" && !pmwithum ) )
 						{
@@ -3487,14 +3483,15 @@ int main(int argc, char *argv[])
 		}
 
 		//set mysql replication, if wasn't setup before on system
-/*		if ( ( mysqlRep && pmwithum ) || 
-			( mysqlRep && (umNumber > 1) ) ||
-			( mysqlRep && (pmNumber > 1) && (IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM) ) ) 
+//		if ( ( mysqlRep && pmwithum ) || 
+//			( mysqlRep && (umNumber > 1) ) ||
+//			( mysqlRep && (pmNumber > 1) && (IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM) ) ) 
+		if ( mysqlRep )
 		{
 			cout << endl << "Run MariaDB ColumnStore Replication Setup.. ";
 			cout.flush();
 
-			//send message to procmon's to run upgrade script
+			//send message to procmon's to run mysql replication script
 			int status = sendReplicationRequest(IserverTypeInstall, password, mysqlPort, pmwithum);
 
 			if ( status != 0 ) {
@@ -3504,7 +3501,7 @@ int main(int argc, char *argv[])
 			else
 				cout << " DONE" << endl;
 		}
-*/
+
 		cout << endl << "MariaDB ColumnStore Install Successfully Completed, System is Active" << endl << endl;
 
 		cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;
@@ -3513,11 +3510,21 @@ int main(int argc, char *argv[])
 
 		cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << endl;
 		cout << "Enter 'mcsadmin' to access the MariaDB ColumnStore Admin console" << endl << endl;
+		
+		cout << "NOTE: The MariaDB ColumnStore Alias Commands are in /etc/profile.d/columnstoreAlias" << endl << endl;
 	}
 	else
 	{
 		cout << " FAILED" << endl;
 		cout << endl << "MariaDB ColumnStore System failed to start, check log files in /var/log/mariadb/columnstore" << endl;
+
+		cout << "Enter the following command to define MariaDB ColumnStore Alias Commands" << endl << endl;
+
+		cout << ". " + installDir + "/bin/columnstoreAlias" << endl << endl;
+
+		cout << "Enter 'mcsmysql' to access the MariaDB ColumnStore SQL console" << endl;
+		cout << "Enter 'mcsadmin' to access the MariaDB ColumnStore Admin console" << endl << endl;
+
 		exit(1);
 	}
 
@@ -4005,9 +4012,9 @@ bool makeRClocal(string moduleType, string moduleName, int IserverTypeInstall)
 	close(fd);
 	
 	if (rootUser)
-	    system("cat /tmp/rc.local >> /etc/rc.local > /dev/null");
+	    system("cat /tmp/rc.local >> /etc/rc.d/rc.local > /dev/null");
 	else
-	    system("sudo cat /tmp/rc.local >> /etc/rc.local > /dev/null");
+	    system("sudo cat /tmp/rc.local >> /etc/rc.d/rc.local > /dev/null");
 
 	unlink(fileName.c_str());
 	  
diff --git a/procmgr/main.cpp b/procmgr/main.cpp
index 73b3edcc3..a1016812d 100644
--- a/procmgr/main.cpp
+++ b/procmgr/main.cpp
@@ -502,6 +502,8 @@ static void startMgrProcessThread()
 	ModuleTypeConfig PMSmoduletypeconfig;
 	ALARMManager aManager;
 
+	int waitTime = 60; 
+	
 	log.writeLog(__LINE__, "startMgrProcessThread launched", LOG_TYPE_DEBUG);
 
 	//get calpont software version and release
@@ -597,7 +599,7 @@ static void startMgrProcessThread()
 	{
 	      int status = API_SUCCESS;
 	      int k = 0;
-	      for( ; k < 200 ; k++ )
+	      for( ; k < waitTime ; k++ )
 	      {
 		      if ( startsystemthreadStop ) {
 			      processManager.setSystemState(oam::MAN_OFFLINE);
@@ -641,7 +643,7 @@ static void startMgrProcessThread()
 		      sleep(1);
 	      }
 
-	      if ( k == 200 || status == API_FAILURE) {
+	      if ( k == waitTime || status == API_FAILURE) {
 		      // system didn't successfull restart
 		      processManager.setSystemState(oam::FAILED);
 		      // exit thread
@@ -653,7 +655,7 @@ static void startMgrProcessThread()
 	
 	//wait until all modules are up after a system reboot
 	int i = 0;
-	for( ; i < 200 ; i++ )
+	for( ; i < waitTime ; i++ )
 	{
 		if ( startsystemthreadStop ) {
 			processManager.setSystemState(oam::MAN_OFFLINE);
@@ -719,7 +721,7 @@ static void startMgrProcessThread()
 			break;
 	}
 
-	if ( i == 200 ) {
+	if ( i == waitTime ) {
 		// system didn't successfull restart
 		processManager.setSystemState(oam::FAILED);
 
@@ -738,7 +740,7 @@ static void startMgrProcessThread()
 	//now wait until all procmons are ACTIVE and validate rpms on each module
 	int status = API_SUCCESS;
 	int k = 0;
-	for( ; k < 200 ; k++ )
+	for( ; k < waitTime ; k++ )
 	{
 		if ( startsystemthreadStop ) {
 			processManager.setSystemState(oam::MAN_OFFLINE);
@@ -859,7 +861,7 @@ static void startMgrProcessThread()
 		}
 	}
 
-	if ( k == 200 || status == API_FAILURE) {
+	if ( k == waitTime || status == API_FAILURE) {
 		// system didn't successfull restart
 		processManager.setSystemState(oam::FAILED);
 		// exit thread
diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp
index e87a94e03..b7def2ac9 100755
--- a/procmgr/processmanager.cpp
+++ b/procmgr/processmanager.cpp
@@ -1143,7 +1143,7 @@ void processMSG(messageqcpp::IOSocket* cfIos)
 					//wait until all child modules are offline or A FAILURE HAS OCCURRED
 					bool failure = false;
 					bool stopped = true;
-					for ( int retry = 0 ; retry < 120 ; retry++ )
+					for ( int retry = 0 ; retry < 30 ; retry++ )
 					{
 						sleep(1);
 						stopped = true;
@@ -3809,7 +3809,9 @@ void ProcessManager::setSystemState(uint16_t state)
 				aManager.sendAlarmReport(system.c_str(), SYSTEM_DOWN_AUTO, SET);
 		aManager.sendAlarmReport(system.c_str(), CONN_FAILURE, CLEAR);
 	}
+	
 	pthread_mutex_unlock(&STATUS_LOCK);
+	return;
 }
 
 /******************************************************************************************
@@ -3839,6 +3841,7 @@ void ProcessManager::setModuleState(string moduleName, uint16_t state)
 	}
 
 	pthread_mutex_unlock(&STATUS_LOCK);
+	return;
 }
 
 /******************************************************************************************
@@ -3867,6 +3870,7 @@ void ProcessManager::setExtdeviceState(string extDeviceName, uint16_t state)
 //		log.writeLog(__LINE__, "EXCEPTION ERROR on setExtDeviceStatus: Caught unknown exception!", LOG_TYPE_ERROR);
 	}
 	pthread_mutex_unlock(&STATUS_LOCK);
+	return;
 }
 
 /******************************************************************************************
@@ -3895,6 +3899,7 @@ void ProcessManager::setNICState(string hostName, uint16_t state)
 //		log.writeLog(__LINE__, "EXCEPTION ERROR on setNICStatus: Caught unknown exception!", LOG_TYPE_ERROR);
 	}
 	pthread_mutex_unlock(&STATUS_LOCK);
+	return;
 }
 
 
@@ -6962,10 +6967,6 @@ void startSystemThread(oam::DeviceNetworkList Devicenetworklist)
 		status = oam::API_FAILURE;
 	}
 
-	log.writeLog(__LINE__, "Setup MySQL Replication for startsystemthread", LOG_TYPE_DEBUG);
-	oam::DeviceNetworkList devicenetworklistRep;
-	processManager.setMySQLReplication(devicenetworklistRep);
-
 	//set query system state not ready
 	processManager.setQuerySystemState(true);
 
@@ -10234,7 +10235,7 @@ int ProcessManager::setMySQLReplication(oam::DeviceNetworkList devicenetworklist
 
 	//also skip if single-server, multi-node seperate with 1 UM, multi-node combo with 1 PM
 
-	string SingleServerInstall = "n";
+/*	string SingleServerInstall = "n";
 	try {
 		oam.getSystemConfig("SingleServerInstall", SingleServerInstall);
 	}
@@ -10282,7 +10283,7 @@ int ProcessManager::setMySQLReplication(oam::DeviceNetworkList devicenetworklist
 			return oam::API_SUCCESS;
 		}
 	}
-
+*/
 	log.writeLog(__LINE__, "Setup MySQL Replication", LOG_TYPE_DEBUG);
 
 	// mysql port number
@@ -10333,7 +10334,6 @@ int ProcessManager::setMySQLReplication(oam::DeviceNetworkList devicenetworklist
 		
 			if ( returnStatus != API_SUCCESS) {
 				log.writeLog(__LINE__, "setMySQLReplication: ERROR: Error getting MySQL Replication Master Information", LOG_TYPE_ERROR);
-				pthread_mutex_unlock(&THREAD_LOCK);
 				return API_FAILURE;
 			}
 		}
@@ -10360,7 +10360,6 @@ int ProcessManager::setMySQLReplication(oam::DeviceNetworkList devicenetworklist
 			
 				if ( returnStatus != API_SUCCESS) {
 					log.writeLog(__LINE__, "setMySQLReplication: ERROR: Error getting MySQL Replication Master Information", LOG_TYPE_ERROR);
-					pthread_mutex_unlock(&THREAD_LOCK);
 					return API_FAILURE;
 				}
 			}
@@ -10383,6 +10382,7 @@ int ProcessManager::setMySQLReplication(oam::DeviceNetworkList devicenetworklist
 
 	if ( returnStatus != API_SUCCESS) {
 		log.writeLog(__LINE__, "setMySQLReplication: ERROR: Error getting MySQL Replication Master Information", LOG_TYPE_ERROR);
+		return API_FAILURE;
 	}
 
 	//
@@ -10450,7 +10450,8 @@ int ProcessManager::setMySQLReplication(oam::DeviceNetworkList devicenetworklist
 			
 				if ( returnStatus != API_SUCCESS) {
 					log.writeLog(__LINE__, "setMySQLReplication: ERROR: Error setting MySQL Replication Slave", LOG_TYPE_ERROR);
-				}
+					return API_FAILURE;
+				 }
 			}
 		}
 	}
@@ -10498,6 +10499,7 @@ int ProcessManager::setMySQLReplication(oam::DeviceNetworkList devicenetworklist
 		
 			if ( returnStatus != API_SUCCESS) {
 				log.writeLog(__LINE__, "setMySQLReplication: ERROR: Error setting MySQL Replication Slave", LOG_TYPE_ERROR);
+				return API_FAILURE;
 			}
 		}
 	}
diff --git a/procmon/main.cpp b/procmon/main.cpp
index 570dea6f9..cc6835f3a 100644
--- a/procmon/main.cpp
+++ b/procmon/main.cpp
@@ -136,7 +136,9 @@ int main(int argc, char **argv)
 	int ret = pthread_create (&MessageThread, NULL, (void*(*)(void*)) &messageThread, &config);
 	if ( ret != 0 ) {
 		log.writeLog(__LINE__, "pthread_create failed, exiting..., return code = " + oam.itoa(ret), LOG_TYPE_CRITICAL);
-		exit (1);
+		string cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /dev/null 2>&1";
+		system(cmd.c_str());
+		exit(1);
 	}
 
 	//check if this is a fresh install, meaning the Columnstore.xml file is not setup
@@ -181,8 +183,15 @@ int main(int argc, char **argv)
 	      log.writeLog(__LINE__, "run module_installer.sh", LOG_TYPE_DEBUG);
 	      log.writeLog(__LINE__, cmd, LOG_TYPE_DEBUG);
 
-	      system(cmd.c_str());
+	      int ret = system(cmd.c_str());
 
+	      if ( ret != 0 ) {
+		      log.writeLog(__LINE__, "module_installer.sh error, exiting..., return code = " + oam.itoa(ret), LOG_TYPE_CRITICAL);
+			string cmd = startup::StartUp::installDir() + "/bin/columnstore stop > /dev/null 2>&1";
+			system(cmd.c_str());
+			exit(1);
+	      }
+	      
 	      //exit to allow ProcMon to restart in a setup state
 	      log.writeLog(__LINE__, "restarting for a initial setup", LOG_TYPE_DEBUG);
 
@@ -2214,7 +2223,7 @@ void processStatusMSG(messageqcpp::IOSocket* cfIos)
 	catch (exception& ex)
 	{
 		string error = ex.what();
-		log.writeLog(__LINE__, "***read error, close create thread: " + error, LOG_TYPE_DEBUG);
+//		log.writeLog(__LINE__, "***read error, close create thread: " + error, LOG_TYPE_DEBUG);
 		fIos->close();
 		delete fIos;
 		delete msg;
@@ -2223,7 +2232,7 @@ void processStatusMSG(messageqcpp::IOSocket* cfIos)
 	}
 	catch(...)
 	{
-		log.writeLog(__LINE__, "***read error, close create thread", LOG_TYPE_DEBUG);
+//		log.writeLog(__LINE__, "***read error, close create thread", LOG_TYPE_DEBUG);
 		fIos->close();
 		delete fIos;
 		delete msg;
@@ -2232,7 +2241,7 @@ void processStatusMSG(messageqcpp::IOSocket* cfIos)
 	}
 
 	if (msg->length() <= 0) {
-		log.writeLog(__LINE__, "***0 bytes, close create thread", LOG_TYPE_DEBUG);
+//		log.writeLog(__LINE__, "***0 bytes, close create thread", LOG_TYPE_DEBUG);
 		fIos->close();
 		delete fIos;
 		delete msg;
diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp
index 517f579aa..eafbd8468 100644
--- a/procmon/processmonitor.cpp
+++ b/procmon/processmonitor.cpp
@@ -4731,7 +4731,7 @@ int ProcessMonitor::changeMyCnf(std::string type)
 
 	string dbDir = startup::StartUp::installDir() + "/mysql/db";
 
-	if ( type == "master" )
+/*	if ( type == "master" )
 	{
 		// set master replication entries
 		vector <string> lines;
@@ -4745,10 +4745,10 @@ int ProcessMonitor::changeMyCnf(std::string type)
 				buf = "server-id = 1";
 			}
 
-			pos = buf.find("# binlog_format=ROW",0);
-			if ( pos != string::npos ) {
-				buf = "binlog_format=ROW";
-			}
+//			pos = buf.find("# binlog_format=ROW",0);
+//			if ( pos != string::npos ) {
+//				buf = "binlog_format=ROW";
+//			}
 
 			pos = buf.find("infinidb_local_query=1",0);
 			if ( pos != string::npos && pos == 0) {
@@ -4774,7 +4774,7 @@ int ProcessMonitor::changeMyCnf(std::string type)
 
 	if ( type == "slave" )
 	{
-		//get slave id based on ExeMgrx setup
+*/		//get slave id based on ExeMgrx setup
 		string slaveID = "0";
 		string slaveModuleName = config.moduleName();
 		for ( int id = 1 ; ; id++ )
@@ -4871,10 +4871,10 @@ int ProcessMonitor::changeMyCnf(std::string type)
 				}
 			}
 
-			pos = buf.find("binlog_format=ROW",0);
-			if ( pos != string::npos && pos == 0 ) {
-				buf = "# binlog_format=ROW";
-			}
+//			pos = buf.find("binlog_format=ROW",0);
+//			if ( pos != string::npos && pos == 0 ) {
+//				buf = "# binlog_format=ROW";
+//			}
 
 			//output to temp file
 			lines.push_back(buf);
@@ -4891,9 +4891,9 @@ int ProcessMonitor::changeMyCnf(std::string type)
 		newFile.close();
 		
 		close(fd);
-	}
+//	}
 
-	if ( type == "disable" )
+/*	if ( type == "disable" )
 	{
 		// set master replication entries
 		vector <string> lines;
@@ -4937,11 +4937,6 @@ int ProcessMonitor::changeMyCnf(std::string type)
 				}
 			}
 
-			pos = buf.find("slave-skip-errors=all",0);
-			if ( pos != string::npos ) {
-				buf = "# slave-skip-errors=all";
-			}
-
 			//output to temp file
 			lines.push_back(buf);
 		}
@@ -4958,7 +4953,7 @@ int ProcessMonitor::changeMyCnf(std::string type)
 		
 		close(fd);
 	}
-
+*/
 	// set owner and permission 
 	string cmd = "chmod 664 " + mycnfFile + " >/dev/null 2>&1";
 	if ( !rootUser)
@@ -5036,6 +5031,11 @@ int ProcessMonitor::runMasterRep(std::string& masterLogFile, std::string& master
 
 			bool passwordError = false;
 
+			string moduleType = systemModuleTypeConfig.moduletypeconfig[i].ModuleType;
+	
+			if ( (PMwithUM == "n") && (moduleType == "pm") && ( config.ServerInstallType() != oam::INSTALL_COMBINE_DM_UM_PM) )
+				continue;
+
 			HostConfigList::iterator pt1 = (*pt).hostConfigList.begin();
 			while(true)	// need in case there is a password retry
 			{
@@ -5076,7 +5076,7 @@ int ProcessMonitor::runMasterRep(std::string& masterLogFile, std::string& master
 				if ( passwordError ) 
 				{
 					try {
-						mysqlpw = oam.getMySQLPassword(true);
+						mysqlpw = oam.getMySQLPassword();
 					}
 					catch (...)
 					{}
@@ -5226,7 +5226,7 @@ int ProcessMonitor::runSlaveRep(std::string& masterLogFile, std::string& masterL
 		if ( passwordError ) 
 		{
 			try {
-				mysqlpw = oam.getMySQLPassword(true);
+				mysqlpw = oam.getMySQLPassword();
 			}
 			catch (...)
 			{}
diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
old mode 100644
new mode 100755
index c39939fdf..c82b72fbf
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -1861,6 +1861,31 @@ int main(int argc, char *argv[])
 	catch(...)
 	{}
 
+	// add entries from tuning guide
+	
+	string ColScanReadAheadBlocks;
+	string PrefetchThreshold;
+	string MaxOutstandingRequests;
+	string PmMaxMemorySmallSide;
+	
+	try {
+		ColScanReadAheadBlocks = sysConfigOld->getConfig("PrimitiveServers", "ColScanReadAheadBlocks");
+		PrefetchThreshold = sysConfigOld->getConfig("PrimitiveServers", "PrefetchThreshold");
+		MaxOutstandingRequests = sysConfigOld->getConfig("JobList", "MaxOutstandingRequests");
+		PmMaxMemorySmallSide = sysConfigOld->getConfig("HashJoin", "PmMaxMemorySmallSide");
+	}
+	catch(...)
+	{}
+	
+	try {
+		sysConfigNew->setConfig("PrimitiveServers", "ColScanReadAheadBlocks", ColScanReadAheadBlocks);
+		sysConfigNew->setConfig("PrimitiveServers", "PrefetchThreshold", PrefetchThreshold);
+		sysConfigNew->setConfig("JobList", "MaxOutstandingRequests", MaxOutstandingRequests);
+		sysConfigNew->setConfig("HashJoin", "PmMaxMemorySmallSide", PmMaxMemorySmallSide);
+	}
+	catch(...)
+	{}
+
 	//Write out Updated System Configuration File
 	sysConfigNew->write();
 }
diff --git a/utils/funcexp/func_cast.cpp b/utils/funcexp/func_cast.cpp
index a48909520..d177d8438 100644
--- a/utils/funcexp/func_cast.cpp
+++ b/utils/funcexp/func_cast.cpp
@@ -80,6 +80,11 @@ CalpontSystemCatalog::ColType Func_cast_decimal::operationType( FunctionParm& fp
 	return resultType;
 }
 
+CalpontSystemCatalog::ColType Func_cast_double::operationType( FunctionParm& fp, CalpontSystemCatalog::ColType& resultType )
+{
+	return resultType;
+}
+
 //
 //	Func_cast_signed
 //
@@ -1088,5 +1093,115 @@ double Func_cast_decimal::getDoubleVal(Row& row,
 }
 
 
+//
+//	Func_cast_double
+//
+
+int64_t Func_cast_double::getIntVal(Row& row,
+									FunctionParm& parm,
+									bool& isNull,
+									CalpontSystemCatalog::ColType& operationColType)
+{
+
+	double dblval = Func_cast_double::getDoubleVal(row,
+				parm,
+				isNull,
+				operationColType);
+
+	return (int64_t) dblval;
+}
+
+
+string Func_cast_double::getStrVal(Row& row,
+									FunctionParm& parm,
+									bool& isNull,
+									CalpontSystemCatalog::ColType& operationColType)
+{
+	double dblval = Func_cast_double::getDoubleVal(row,
+				parm,
+				isNull,
+				operationColType);
+
+    std::string value = helpers::doubleToString(dblval);
+
+	return value;
+
+}
+
+
+double Func_cast_double::getDoubleVal(Row& row,
+									FunctionParm& parm,
+									bool& isNull,
+									CalpontSystemCatalog::ColType& operationColType)
+{
+    double dblval;
+
+    // TODO: Here onwards
+	switch (parm[0]->data()->resultType().colDataType)
+	{
+		case execplan::CalpontSystemCatalog::BIGINT:
+		case execplan::CalpontSystemCatalog::INT:
+		case execplan::CalpontSystemCatalog::MEDINT:
+		case execplan::CalpontSystemCatalog::TINYINT:
+		case execplan::CalpontSystemCatalog::SMALLINT:
+        case execplan::CalpontSystemCatalog::DATE:
+        case execplan::CalpontSystemCatalog::DATETIME:
+		{
+			int64_t intval = parm[0]->data()->getIntVal(row, isNull);
+            dblval = (double) intval;
+		}
+		break;
+
+        case execplan::CalpontSystemCatalog::UBIGINT:
+        case execplan::CalpontSystemCatalog::UINT:
+        case execplan::CalpontSystemCatalog::UMEDINT:
+        case execplan::CalpontSystemCatalog::UTINYINT:
+        case execplan::CalpontSystemCatalog::USMALLINT:
+        {
+            uint64_t uintval = parm[0]->data()->getUintVal(row, isNull);
+            dblval = (double) uintval;
+        }
+        break;
+
+        case execplan::CalpontSystemCatalog::DOUBLE:
+        case execplan::CalpontSystemCatalog::UDOUBLE:
+		case execplan::CalpontSystemCatalog::FLOAT:
+		case execplan::CalpontSystemCatalog::UFLOAT:
+		{
+			dblval = parm[0]->data()->getDoubleVal(row, isNull);
+		}
+		break;
+
+		case execplan::CalpontSystemCatalog::DECIMAL:
+        case execplan::CalpontSystemCatalog::UDECIMAL:
+		{
+			IDB_Decimal decimal = parm[0]->data()->getDecimalVal(row, isNull);
+
+            dblval = (double)(decimal.value / pow((double)10, decimal.scale));
+		}
+		break;
+
+		case execplan::CalpontSystemCatalog::VARCHAR:
+		case execplan::CalpontSystemCatalog::CHAR:
+		case execplan::CalpontSystemCatalog::TEXT:
+        {
+            const string& strValue = parm[0]->data()->getStrVal(row, isNull);
+
+            dblval = strtod(strValue.c_str(), NULL);
+        }
+		break;
+
+		default:
+		{
+			std::ostringstream oss;
+			oss << "cast: datatype of " << execplan::colDataTypeToString(operationColType.colDataType);
+			throw logging::IDBExcept(oss.str(), ERR_DATATYPE_NOT_SUPPORT);
+		}
+	}
+
+	return dblval;
+}
+
+
 } // namespace funcexp
 // vim:ts=4 sw=4:
diff --git a/utils/funcexp/funcexp.cpp b/utils/funcexp/funcexp.cpp
index 270f30328..539000070 100644
--- a/utils/funcexp/funcexp.cpp
+++ b/utils/funcexp/funcexp.cpp
@@ -86,6 +86,7 @@ FuncExp::FuncExp()
 	fFuncMap["cast_as_date"] = new Func_cast_date();	//dlh
 	fFuncMap["cast_as_datetime"] = new Func_cast_datetime();	//dlh
 	fFuncMap["decimal_typecast"] = new Func_cast_decimal();	//dlh
+    fFuncMap["double_typecast"] = new Func_cast_double();
 	fFuncMap["ceil"] = new Func_ceil();	//dlh
 	fFuncMap["ceiling"] = new Func_ceil();	//dlh
 	fFuncMap["char"] = new Func_char();	//dlh
diff --git a/utils/funcexp/functor_real.h b/utils/funcexp/functor_real.h
index e90a2ecf9..0908be451 100644
--- a/utils/funcexp/functor_real.h
+++ b/utils/funcexp/functor_real.h
@@ -303,6 +303,31 @@ public:
 						execplan::CalpontSystemCatalog::ColType& op_ct);
 };
 
+/** @brief Func_cast_double class
+  */
+class Func_cast_double : public Func_Real
+{
+public:
+	Func_cast_double() : Func_Real("cast_double") {}
+	virtual ~Func_cast_double() {}
+
+	execplan::CalpontSystemCatalog::ColType operationType(FunctionParm& fp, execplan::CalpontSystemCatalog::ColType& resultType);
+
+	int64_t getIntVal(rowgroup::Row& row,
+						FunctionParm& fp,
+						bool& isNull,
+						execplan::CalpontSystemCatalog::ColType& op_ct);
+
+	double getDoubleVal(rowgroup::Row& row,
+						FunctionParm& fp,
+						bool& isNull,
+						execplan::CalpontSystemCatalog::ColType& op_ct);
+
+	std::string getStrVal(rowgroup::Row& row,
+						FunctionParm& fp,
+						bool& isNull,
+						execplan::CalpontSystemCatalog::ColType& op_ct);
+};
 
 /** @brief Func_mod class
   */