Index: branches/5.1.x/install/upgrades.sql
===================================================================
diff -u -N -r13762 -r13769
--- branches/5.1.x/install/upgrades.sql	(.../upgrades.sql)	(revision 13762)
+++ branches/5.1.x/install/upgrades.sql	(.../upgrades.sql)	(revision 13769)
@@ -167,4 +167,15 @@
 
 # ===== v 5.1.0-B2 =====
 
+# ===== v 5.1.0-RC1 =====
+UPDATE Phrase
+SET PhraseType = 1
+WHERE Phrase IN (
+	'la_col_Qty', 'la_col_QtyBackordered', 'la_ItemBackordered', 'la_ship_all_together',
+	'la_ship_backorders_upon_avail', 'la_ship_backorder_separately', 'la_tooltip_New_Coupon',
+	'la_tooltip_New_Discount'
+);
+
+DELETE FROM Phrase WHERE Phrase = 'la_comm_ProductsByManuf';
+
 # ===== v 5.1.0-RC1 =====
\ No newline at end of file
Index: branches/5.1.x/install/english.lang
===================================================================
diff -u -N -r13632 -r13769
--- branches/5.1.x/install/english.lang	(.../english.lang)	(revision 13632)
+++ branches/5.1.x/install/english.lang	(.../english.lang)	(revision 13769)
@@ -164,6 +164,8 @@
 			<PHRASE Label="la_col_ProductType" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
 			<PHRASE Label="la_col_ProductWeight" Module="In-Commerce" Type="1">V2VpZ2h0</PHRASE>
 			<PHRASE Label="la_col_Profit" Module="In-Commerce" Type="1">UHJvZml0</PHRASE>
+			<PHRASE Label="la_col_Qty" Module="In-Commerce" Type="1">UXR5</PHRASE>
+			<PHRASE Label="la_col_QtyBackordered" Module="In-Commerce" Type="1">QmFja29yZGVyZWQ=</PHRASE>
 			<PHRASE Label="la_col_QtyInStock" Module="In-Commerce" Type="1">UXR5IEluIFN0b2Nr</PHRASE>
 			<PHRASE Label="la_col_QtyInStockMin" Module="In-Commerce" Type="1">UXR5SW5TdG9ja01pbg==</PHRASE>
 			<PHRASE Label="la_col_QtyOnOrder" Module="In-Commerce" Type="1">UXR5IE9uIE9yZGVy</PHRASE>
@@ -334,7 +336,6 @@
 			<PHRASE Label="la_fld_FromDateTime" Module="In-Commerce" Type="1">RnJvbSBkYXRlL3RpbWU=</PHRASE>
 			<PHRASE Label="la_fld_Gateway" Module="In-Commerce" Type="1">R2F0ZXdheQ==</PHRASE>
 			<PHRASE Label="la_fld_GroundDelivery" Module="In-Commerce" Type="1">R3JvdW5kIERlbGl2ZXJ5</PHRASE>
-			<PHRASE Label="la_fld_Group" Module="In-Commerce" Type="1">VXNlciBHcm91cA==</PHRASE>
 			<PHRASE Label="la_fld_Groups" Module="In-Commerce" Type="1">VXNlciBHcm91cHMgU2VsZWN0aW9u</PHRASE>
 			<PHRASE Label="la_fld_Instructions" Module="In-Commerce" Type="1">SW5zdHJ1Y3Rpb25z</PHRASE>
 			<PHRASE Label="la_fld_InsuranceFee" Module="In-Commerce" Type="1">SW5zdXJhbmNlIENvc3Q=</PHRASE>
@@ -491,6 +492,7 @@
 			<PHRASE Label="la_IRR" Module="In-Commerce" Type="1">SXJhbmlhbiBSaWFs</PHRASE>
 			<PHRASE Label="la_ISK" Module="In-Commerce" Type="1">SWNlbGFuZCBLcm9uYQ==</PHRASE>
 			<PHRASE Label="la_ISOUsedIfBlank" Module="In-Commerce" Type="1">SVNPIENvZGUgd2lsbCBiZSB1c2VkIGlmIGxlZnQgYmxhbms=</PHRASE>
+			<PHRASE Label="la_ItemBackordered" Module="In-Commerce" Type="1">YmFja29yZGVyZWQ=</PHRASE>
 			<PHRASE Label="la_ItemTab_Products" Module="In-Commerce" Type="1">UHJvZHVjdHM=</PHRASE>
 			<PHRASE Label="la_JMD" Module="In-Commerce" Type="1">SmFtYWljYW4gRG9sbGFy</PHRASE>
 			<PHRASE Label="la_JOD" Module="In-Commerce" Type="1">Sm9yZGFuaWFuIERpbmFy</PHRASE>
@@ -602,6 +604,13 @@
 			<PHRASE Label="la_permission_in-commerce:shipping.advanced:decline" Module="In-Commerce" Type="1">RGlzYWJsZSBTaGlwcGluZyBUeXBl</PHRASE>
 			<PHRASE Label="la_permission_in-commerce:shipping_quote_engines.advanced:approve" Module="In-Commerce" Type="1">RW5hYmxlIFNoaXBwaW5nIFF1b3RpbmcgRW5naW5lcw==</PHRASE>
 			<PHRASE Label="la_permission_in-commerce:shipping_quote_engines.advanced:decline" Module="In-Commerce" Type="1">RGlzYWJsZSBTaGlwcGluZyBRdW90aW5nIEVuZ2luZXM=</PHRASE>
+			<PHRASE Label="la_PermName_Product.Add_desc" Module="In-Commerce" Type="1">QWRkIFByb2R1Y3Q=</PHRASE>
+			<PHRASE Label="la_PermName_Product.Delete_desc" Module="In-Commerce" Type="1">RGVsZXRlIFByb2R1Y3Q=</PHRASE>
+			<PHRASE Label="la_PermName_Product.Modify_desc" Module="In-Commerce" Type="1">TW9kaWZ5IFByb2R1Y3Q=</PHRASE>
+			<PHRASE Label="la_PermName_Product.Rate_desc" Module="In-Commerce" Type="1">UmF0ZSBQcm9kdWN0</PHRASE>
+			<PHRASE Label="la_PermName_Product.Review_desc" Module="In-Commerce" Type="1">Q29tbWVudCBQcm9kdWN0</PHRASE>
+			<PHRASE Label="la_PermName_Product.Review_Pending_desc" Module="In-Commerce" Type="1">Q29tbWVudCBQcm9kdWN0IFBlbmRpbmc=</PHRASE>
+			<PHRASE Label="la_PermName_Product.View_desc" Module="In-Commerce" Type="1">VmlldyBQcm9kdWN0</PHRASE>
 			<PHRASE Label="la_Perpage_Manufacturers" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVycyBwZXIgcGFnZQ==</PHRASE>
 			<PHRASE Label="la_Perpage_Manufacturers_Short" Module="In-Commerce" Type="1">TWFudWZhY3R1cmVycyBwZXIgcGFnZSBvbiBhIHNob3J0IGxpc3Rpbmc=</PHRASE>
 			<PHRASE Label="la_Perpage_Products" Module="In-Commerce" Type="1">TnVtYmVyIG9mIHByb2R1Y3RzIHBlciBwYWdl</PHRASE>
@@ -909,6 +918,8 @@
 			<PHRASE Label="la_ToolTip_NewTaxZone" Module="In-Commerce" Type="1">TmV3IFRheCBab25l</PHRASE>
 			<PHRASE Label="la_ToolTip_New_Affiliate" Module="In-Commerce" Type="1">TmV3IEFmZmlsaWF0ZQ==</PHRASE>
 			<PHRASE Label="la_ToolTip_New_Affiliate_Plan" Module="In-Commerce" Type="1">TmV3IEFmZmlsaWF0ZSBQbGFu</PHRASE>
+			<PHRASE Label="la_tooltip_New_Coupon" Module="In-Commerce" Type="1">TmV3IENvdXBvbg==</PHRASE>
+			<PHRASE Label="la_tooltip_New_Discount" Module="In-Commerce" Type="1">TmV3IERpc2NvdW50</PHRASE>
 			<PHRASE Label="la_ToolTip_New_Order" Module="In-Commerce" Type="1">TmV3IE9yZGVy</PHRASE>
 			<PHRASE Label="la_ToolTip_New_PricingLimit" Module="In-Commerce" Type="1">TmV3IFByaWNpbmcgTGltaXQ=</PHRASE>
 			<PHRASE Label="la_tooltip_new_products" Module="In-Commerce" Type="1">QWRkIG5ldyBwcm9kdWN0cw==</PHRASE>
@@ -980,13 +991,6 @@
 			<PHRASE Label="lu_comm_LastQuater" Module="In-Commerce" Type="1">TGFzdCBRdWF0ZXI=</PHRASE>
 			<PHRASE Label="lu_comm_ProfileAddressWarning" Module="In-Commerce" Type="1">VGhpcyBpcyB5b3VyIHByb2ZpbGUgYWRkcmVzcy4gSXQgd2lsbCBiZSB1cGRhdGVkIGlmIHlvdSBlZGl0IHRoZSBhZGRyZXNzIGJlbG93Lg==</PHRASE>
 			<PHRASE Label="lu_field_manufacturer" Module="In-Commerce" Type="2">TWFudWZhY3R1cmVy</PHRASE>
-			<PHRASE Label="lu_PermName_Product.Add_desc" Module="In-Commerce" Type="1">QWRkIFByb2R1Y3Q=</PHRASE>
-			<PHRASE Label="lu_PermName_Product.Delete_desc" Module="In-Commerce" Type="1">RGVsZXRlIFByb2R1Y3Q=</PHRASE>
-			<PHRASE Label="lu_PermName_Product.Modify_desc" Module="In-Commerce" Type="1">TW9kaWZ5IFByb2R1Y3Q=</PHRASE>
-			<PHRASE Label="lu_PermName_Product.Rate_desc" Module="In-Commerce" Type="1">UmF0ZSBQcm9kdWN0</PHRASE>
-			<PHRASE Label="lu_PermName_Product.Review_desc" Module="In-Commerce" Type="1">Q29tbWVudCBQcm9kdWN0</PHRASE>
-			<PHRASE Label="lu_PermName_Product.Review_Pending_desc" Module="In-Commerce" Type="1">Q29tbWVudCBQcm9kdWN0IFBlbmRpbmc=</PHRASE>
-			<PHRASE Label="lu_PermName_Product.View_desc" Module="In-Commerce" Type="1">VmlldyBQcm9kdWN0</PHRASE>
 			<PHRASE Label="lu_ship_Shipment" Module="In-Commerce" Type="1">U2hpcG1lbnQ=</PHRASE>
 			<PHRASE Label="lu_ship_ShippingType" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZQ==</PHRASE>
 			<PHRASE Label="lu_title_ReviewProduct" Module="In-Commerce" Type="1">Q29tbWVudCB0aGlzIFByb2R1Y3Q=</PHRASE>
Index: branches/5.1.x/install/install_data.sql
===================================================================
diff -u -N -r13632 -r13769
--- branches/5.1.x/install/install_data.sql	(.../install_data.sql)	(revision 13632)
+++ branches/5.1.x/install/install_data.sql	(.../install_data.sql)	(revision 13769)
@@ -321,13 +321,13 @@
 INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 3, 131);
 INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 1, 131);
 
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.RATE', 'lu_PermName_Product.Rate_desc', 'lu_PermName_Product.Rate_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW', 'lu_PermName_Product.Review_desc', 'lu_PermName_Product.Review_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 'lu_PermName_Product.Review_Pending_desc', ' lu_PermName_Product.Review_Pending_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.ADD', 'lu_PermName_Product.Add_desc', 'lu_PermName_Product.Add_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.DELETE', 'lu_PermName_Product.Delete_desc', 'lu_PermName_Product.Delete_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.MODIFY', 'lu_PermName_Product.Modify_desc', 'lu_PermName_Product.Modify_desc', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.VIEW', 'lu_PermName_Product.View_desc', 'lu_PermName_Product.View_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.RATE', 'la_PermName_Product.Rate_desc', 'la_PermName_Product.Rate_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW', 'la_PermName_Product.Review_desc', 'la_PermName_Product.Review_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 'la_PermName_Product.Review_Pending_desc', ' la_PermName_Product.Review_Pending_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.ADD', 'la_PermName_Product.Add_desc', 'la_PermName_Product.Add_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.DELETE', 'la_PermName_Product.Delete_desc', 'la_PermName_Product.Delete_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.MODIFY', 'la_PermName_Product.Modify_desc', 'la_PermName_Product.Modify_desc', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.VIEW', 'la_PermName_Product.View_desc', 'la_PermName_Product.View_error', 'In-Commerce');
 
 INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.VIEW', 14, 1, 0, {ProductCatId});
 INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.RATE', 13, 1, 0, {ProductCatId});