diff --git a/modules/Inventory/models/MassEditRecordStructure.php b/modules/Inventory/models/MassEditRecordStructure.php
index 8da0e0dc828ff625f443d903b5c3463bd99213e7..f8586882a8dc11f0177a84705b63d5b4ba57a52e 100644
--- a/modules/Inventory/models/MassEditRecordStructure.php
+++ b/modules/Inventory/models/MassEditRecordStructure.php
@@ -34,6 +34,12 @@ class Inventory_MassEditRecordStructure_Model extends Vtiger_MassEditRecordStruc
 				foreach($fieldModelList as $fieldName=>$fieldModel) {
 					if($fieldModel->isEditable() && $fieldModel->isMassEditable()) {
 						if($fieldModel->isViewable() && $this->isFieldRestricted($fieldModel)) {
+							if ($fieldModel->isMandatory()) {
+								$dataType = $fieldModel->get('typeofdata');
+								$explodeDataType = explode('~', $dataType);
+								$fieldModel->set('typeofdata', $explodeDataType[0] . '~O');
+							}
+
 							if($recordExists) {
 								$fieldModel->set('fieldvalue', $recordModel->get($fieldName));
 								if ($fieldName == 'terms_conditions') {
diff --git a/modules/Migration/schema/660_to_700.php b/modules/Migration/schema/660_to_700.php
index 6400f49c8d0eca5a5fac283952251b24f2225004..cd799a67fcf4b43d30ba3dcf70157ac8e6029eba 100644
--- a/modules/Migration/schema/660_to_700.php
+++ b/modules/Migration/schema/660_to_700.php
@@ -12,6 +12,11 @@ if(defined('VTIGER_UPGRADE')) {
 	global $adb, $current_user;
 	$db = PearDatabase::getInstance();
 
+	$result = $db->pquery('SELECT 1 FROM vtiger_ws_fieldtype WHERE uitype=?', array('98'));
+	if ($db->num_rows($result)) {
+		$db->pquery('INSERT INTO vtiger_ws_fieldtype(uitype,fieldtype) VALUES(?, ?)', array('98', 'reference'));
+	}
+
 	if (!Vtiger_Utils::CheckTable('vtiger_activity_recurring_info')) {
 		$db->pquery('CREATE TABLE IF NOT EXISTS vtiger_activity_recurring_info(activityid INT(19) NOT NULL, recurrenceid INT(19) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=UTF8;', array());
 	}
diff --git a/modules/Vtiger/models/MassEditRecordStructure.php b/modules/Vtiger/models/MassEditRecordStructure.php
index cf76bfc4cf6403e0a09172495365657524e62ab2..cddb454f3a25d6c05b6e5287729c0e3a56e16973 100644
--- a/modules/Vtiger/models/MassEditRecordStructure.php
+++ b/modules/Vtiger/models/MassEditRecordStructure.php
@@ -34,6 +34,12 @@ class Vtiger_MassEditRecordStructure_Model extends Vtiger_EditRecordStructure_Mo
 				foreach($fieldModelList as $fieldName=>$fieldModel) {
 					if($fieldModel->isEditable() && $fieldModel->isMassEditable()) {
 						if($fieldModel->isViewable() && $this->isFieldRestricted($fieldModel)) {
+							if ($fieldModel->isMandatory()) {
+								$dataType = $fieldModel->get('typeofdata');
+								$explodeDataType = explode('~', $dataType);
+								$fieldModel->set('typeofdata', $explodeDataType[0] . '~O');
+							}
+
 							if($recordExists) {
 								$fieldModel->set('fieldvalue', $recordModel->get($fieldName));
 							}
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index 999678facf1bac63fa4c9e64687e490904957e1f..025dfd643cdc93b1d225b92c72cba63e94030e79 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/Webforms/modules/Webforms/capture.php b/pkg/vtiger/modules/Webforms/modules/Webforms/capture.php
index 0f006c445db3948a0f80e2a6a9a22d7499240586..d63fde131a84b7b6674ec138609843f24be462fb 100644
--- a/pkg/vtiger/modules/Webforms/modules/Webforms/capture.php
+++ b/pkg/vtiger/modules/Webforms/modules/Webforms/capture.php
@@ -10,6 +10,7 @@
 // Switch the working directory to base
 chdir(dirname(__FILE__) . '/../..');
 
+include_once 'includes/Loader.php';
 include_once 'include/Zend/Json.php';
 include_once 'vtlib/Vtiger/Module.php';
 include_once 'include/utils/VtlibUtils.php';