diff --git a/AUTHORS b/AUTHORS
index c6551194..b00bdb74 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -85,5 +85,6 @@ Written in 2019 by Jacob Barnes - Tellan
 Written in 2020 by Joseph Wager - JWager-rch
 Written in 2021 by Amir Anjomshoaa - amiranjom
 Written in 2022 by Guru Dharam Singh Khalsa - pandor4u
+Written in 2023 by Zhang Wei - hellozhangwei
 
 ===========================================================================
diff --git a/screen/MyAccount/User/Account.xml b/screen/MyAccount/User/Account.xml
index 9eeef095..15ee6451 100644
--- a/screen/MyAccount/User/Account.xml
+++ b/screen/MyAccount/User/Account.xml
@@ -23,6 +23,27 @@ along with this software (see the LICENSE.md file). If not, see
 
     <transition name="updateUser"><service-call name="mantle.party.PartyServices.update#Account" in-map="context"/>
         <default-response url="."/></transition>
+
+    <transition name="createContent">
+        <actions>
+            <if condition="partyContentId">
+                <service-call name="mantle.party.PartyServices.update#PartyContent" in-map="context"/>
+                <else>
+                    <service-call name="mantle.party.PartyServices.create#PartyContent" in-map="context"/>
+                </else>
+            </if>
+        </actions>
+        <default-response url="."/></transition>
+
+    <transition name="downloadContent" read-only="true">
+        <parameter name="partyContentId"/>
+        <actions>
+            <entity-find-one entity-name="mantle.party.PartyContent" value-field="partyContent"/>
+            <script>ec.web.sendResourceResponse(partyContent.contentLocation)</script>
+        </actions>
+        <default-response type="none"/>
+    </transition>
+
     <transition name="changePassword"><service-call name="org.moqui.impl.UserServices.update#Password"/>
         <default-response url="."/><error-response url="."/></transition>
 
@@ -74,8 +95,29 @@ along with this software (see the LICENSE.md file). If not, see
         <!-- only show SMS dialog if org.moqui.SmsServices.send#SmsMessage service is NOT from moqui-framework (on classpath) -->
         <set field="sendSmsLoc" from="ec.service.getServiceDefinition('org.moqui.SmsServices.send#SmsMessage')?.serviceNode?.fileLocation"/>
         <set field="isSmsActive" from="sendSmsLoc &amp;&amp; !sendSmsLoc.contains('classpath')"/>
+
+        <entity-find entity-name="mantle.party.PartyContent" list="contentList">
+            <econdition field-name="partyId"/>
+            <econdition field-name="partyContentTypeEnumId" value="PcntPrimaryImage"/>
+            <econdition field-name="contentLocation" operator="not-equals" value=""/>
+            <order-by field-name="-contentDate"/>
+        </entity-find>
+        <set field="partyContentId" from="contentList?.first.partyContentId"/>
+
     </actions>
     <widgets>
+
+        <form-single name="NewContentForm" transition="createContent">
+            <field name="partyId"><default-field><hidden/></default-field></field>
+            <field name="partyContentId" from="partyContentId"><default-field><hidden/></default-field></field>
+            <field name="partyContentTypeEnumId"><default-field><hidden default-value="PcntPrimaryImage"/></default-field></field>
+            <field name="contentFile"><default-field>
+                <image-file url="downloadContent/${partyContentId}/${ec.user.nowTimestamp}"/>
+                <!--<image url="downloadContent/${partyId}" url-type="transition" />-->
+            </default-field></field>
+            <field name="submitButton"><default-field><submit text="Save"/></default-field></field>
+        </form-single>
+
         <container-panel id="UserInfoContainer">
             <panel-center>
                 <container-dialog id="change-password" button-text="Change Password">
diff --git a/screen/SimpleScreens/Accounting/Reports/SalesSummaryStats.html.ftl b/screen/SimpleScreens/Accounting/Reports/SalesSummaryStats.html.ftl
index e76b1638..c0f58b9c 100644
--- a/screen/SimpleScreens/Accounting/Reports/SalesSummaryStats.html.ftl
+++ b/screen/SimpleScreens/Accounting/Reports/SalesSummaryStats.html.ftl
@@ -15,14 +15,14 @@ along with this software (see the LICENSE.md file). If not, see
     <#assign modalTitle = title + " Detail">
     <#if sri.getRenderMode() == "vuet" || sri.getRenderMode() == "html">
         <div class="panel panel-default"><div class="panel-body" onclick="$('#${modalId}').modal('show');">
-                <h5 class="text-center" style="margin-top:0;">${title}</h5>
+                <h5 class="text-center" style="margin-top:0;">${ec.l10n.localize(title)}</h5>
                 <@statsPanelContent title mainFormat valThis valLast valPrior valAvg false chartList chartMaList labelList/>
         </div></div>
         <div class="modal fade" id="${modalId}" tabindex="-1" role="dialog">
             <div class="modal-dialog modal-lg" role="document"><div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title">${title}</h4>
+                    <h4 class="modal-title">${ec.l10n.localize(title)}</h4>
                 </div>
                 <div class="modal-body">
                     <@statsPanelContent modalTitle mainFormat valThis valLast valPrior valAvg true chartList chartMaList labelList/>
@@ -30,10 +30,10 @@ along with this software (see the LICENSE.md file). If not, see
             </div></div>
         </div>
     <#elseif sri.getRenderMode() == "qvt">
-        <m-container-dialog title="${title}">
+        <m-container-dialog title="${ec.l10n.localize(title)}">
             <template v-slot:button>
                 <q-card flat bordered class="q-ma-sm"><q-card-section>
-                    <h5 class="text-center" style="margin-top:0;margin-bottom:8px;">${title}</h5>
+                    <h5 class="text-center" style="margin-top:0;margin-bottom:8px;">${ec.l10n.localize(title)}</h5>
                     <@statsPanelContent title mainFormat valThis valLast valPrior valAvg false chartList chartMaList labelList/>
                 </q-card-section></q-card>
             </template>
diff --git a/screen/SimpleScreens/Catalog/FeatureGroup/EditFeatureGroup.xml b/screen/SimpleScreens/Catalog/FeatureGroup/EditFeatureGroup.xml
index 75a81bd8..8ed72e90 100644
--- a/screen/SimpleScreens/Catalog/FeatureGroup/EditFeatureGroup.xml
+++ b/screen/SimpleScreens/Catalog/FeatureGroup/EditFeatureGroup.xml
@@ -30,14 +30,11 @@ along with this software (see the LICENSE.md file). If not, see
 
     <transition name="createProductFeatureGroupAppl">
         <actions>
-            <if condition="productFeatureId instanceof Collection"><then>
-                <iterate list="productFeatureId" entry="curId">
-                    <service-call name="create#mantle.product.feature.ProductFeatureGroupAppl"
-                            in-map="[productFeatureId:curId, productFeatureGroupId:productFeatureGroupId, fromDate:fromDate]"/>
-                </iterate>
-            </then><else>
-                <service-call name="create#mantle.product.feature.ProductFeatureGroupAppl" in-map="context"/>
-            </else></if>
+            <set field="productFeatureIds" from="productFeatureId?.split(',')"/>
+            <iterate list="productFeatureIds" entry="curId">
+                <service-call name="create#mantle.product.feature.ProductFeatureGroupAppl"
+                        in-map="[productFeatureId:curId, productFeatureGroupId:productFeatureGroupId, fromDate:fromDate]"/>
+            </iterate>
         </actions>
         <default-response url="."/>
     </transition>
diff --git a/screen/SimpleScreens/Shipping/Picklist/PicklistDetail.xml b/screen/SimpleScreens/Shipping/Picklist/PicklistDetail.xml
index c4d18ac5..2c2d2c93 100644
--- a/screen/SimpleScreens/Shipping/Picklist/PicklistDetail.xml
+++ b/screen/SimpleScreens/Shipping/Picklist/PicklistDetail.xml
@@ -348,8 +348,8 @@ along with this software (see the LICENSE.md file). If not, see
                             <box-body>
                                 <container-row>
                                     <row-col lg="5">
-                                        <section-include name="AssetStatusChangeAndHistorySection"
-                                                location="component://SimpleScreens/template/basic/StatusWidgets.xml#StatusChangeSection"/>
+                                        <section-include name="StatusChangeAndHistorySection"
+                                                location="component://SimpleScreens/template/basic/StatusWidgets.xml"/>
                                     </row-col>
                                     <row-col lg="7">
                                         <form-single name="UpdateAssetAssign" transition="updateAssetAssign" map="assetAssign">