diff --git a/AUTHORS b/AUTHORS
index 27dbd1a34..28e89ca3e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -46,7 +46,7 @@ Written in 2015 by Sam Hamilton - samhamilton
 Written in 2015 by Leonardo Carvalho - CarvalhoLeonardo
 Written in 2015 by Swapnil M Mane - swapnilmmane
 Written in 2015 by Anton Akhiar - akhiar
-Written in 2015-2018 by Jens Hardings - jenshp
+Written in 2015-2023 by Jens Hardings - jenshp
 Written in 2016 by Shifeng Zhang - zhangshifeng
 Written in 2016 by Scott Gray - lektran
 Written in 2016 by Mark Haney - mphaney
@@ -54,13 +54,14 @@ Written in 2016 by Qiushi Yan - yanqiushi
 Written in 2017 by Oleg Andrieiev - oandreyev
 Written in 2018 by Zhang Wei - zhangwei1979
 Written in 2018 by Nirendra Singh - nirendra10695
-Written in 2018-2021 by Ayman Abi Abdallah - aabiabdallah
+Written in 2018-2023 by Ayman Abi Abdallah - aabiabdallah
 Written in 2019 by Daniel Taylor - danieltaylor-nz
 Written in 2020 by Jacob Barnes - Tellan
 Written in 2020 by Amir Anjomshoaa - amiranjom
 Written in 2021 by Deepak Dixit - dixitdeepak
 Written in 2021 by Taher Alkhateeb - pythys
 Written in 2022 by Zhang Wei - hellozhangwei
+Written in 2023 by Rohit Pawar - rohitpawar2811
 
 ===========================================================================
 
@@ -93,7 +94,7 @@ Written in 2015 by Jimmy Shen - shendepu
 Written in 2015-2016 by Sam Hamilton - samhamilton
 Written in 2015 by Leonardo Carvalho - CarvalhoLeonardo
 Written in 2015 by Anton Akhiar - akhiar
-Written in 2015-2016 by Jens Hardings - jenshp
+Written in 2015-2023 by Jens Hardings - jenshp
 Written in 2016 by Shifeng Zhang - zhangshifeng
 Written in 2016 by Scott Gray - lektran
 Written in 2016 by Mark Haney - mphaney
@@ -101,12 +102,13 @@ Written in 2016 by Qiushi Yan - yanqiushi
 Written in 2017 by Oleg Andrieiev - oandreyev
 Written in 2018 by Zhang Wei - zhangwei1979
 Written in 2018 by Nirendra Singh - nirendra10695
-Written in 2018-2020 by Ayman Abi Abdallah - aabiabdallah
+Written in 2018-2023 by Ayman Abi Abdallah - aabiabdallah
 Written in 2019 by Daniel Taylor - danieltaylor-nz
 Written in 2020 by Jacob Barnes - Tellan
 Written in 2020 by Amir Anjomshoaa - amiranjom
 Written in 2021 by Deepak Dixit - dixitdeepak
 Written in 2021 by Taher Alkhateeb - pythys
 Written in 2022 by Zhang Wei - hellozhangwei
+Written in 2023 by Rohit Pawar - rohitpawar2811
 
 ===========================================================================
diff --git a/addons.xml b/addons.xml
index d449211e1..f5d4f2aac 100644
--- a/addons.xml
+++ b/addons.xml
@@ -52,6 +52,7 @@
     <component name="moqui-orientdb" group="moqui" version="1.0.4" branch="master"/>
     <component name="moqui-poi" group="moqui" version="1.0.1" branch="master"/>
     <component name="moqui-sftp" group="moqui" version="1.0.1" branch="master"/>
+    <component name="moqui-sso" group="moqui" version="1.0.1" branch="master"/>
     <component name="moqui-wikitext" group="moqui" version="1.0.3" branch="master"/>
 
     <component name="moqui-atomikos" group="moqui" version="1.0.0" branch="master"/><!-- not actively maintained -->
diff --git a/build.gradle b/build.gradle
index 3b591d4c6..3fc65c0e6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -417,13 +417,26 @@ task gitStatusAll {
             def curGrgit = Grgit.open(dir: gitDir)
             logger.lifecycle("\nGit status for ${gitDir} (branch:${curGrgit.branch.current()?.name}, tracking:${curGrgit.branch.current()?.trackingBranch?.name})")
 
-            if (curGrgit.remote.list().find({ it.name == 'upstream'})) {
-                def upstreamAhead = curGrgit.log { range curGrgit.resolve.toCommit('refs/remotes/upstream/master'), curGrgit.resolve.toCommit('refs/remotes/origin/master') }
-                if (upstreamAhead) logger.lifecycle("- origin/master ${upstreamAhead.size()} commits ahead of upstream/master")
+            try {
+                if (curGrgit.remote.list().find({ it.name == 'upstream'})) {
+                    def upstreamAhead = curGrgit.log { range curGrgit.resolve.toCommit('refs/remotes/upstream/master'), curGrgit.resolve.toCommit('refs/remotes/origin/master') }
+                    if (upstreamAhead) logger.lifecycle("- origin/master ${upstreamAhead.size()} commits ahead of upstream/master")
+                }
+            } catch (Exception e) {
+                logger.error("Error finding commits ahead of upstream", e)
+            }
+            try {
+                def masterLatest = curGrgit.resolve.toCommit('refs/remotes/origin/master')
+                if (masterLatest == null) {
+                    logger.error("No origin/master branch exists, can't determine unpushed commits")
+                } else {
+                    def unpushed = curGrgit.log { range masterLatest, curGrgit.resolve.toCommit('HEAD') }
+                    if (unpushed) logger.lifecycle("--- ${unpushed.size()} commits unpushed (ahead of origin/master)")
+                    for (Commit commit in unpushed) logger.lifecycle(" - ${commit.getAbbreviatedId(8)} - ${commit.shortMessage}")
+                }
+            } catch (Exception e) {
+                logger.error("Error finding unpushed commits", e)
             }
-            def unpushed = curGrgit.log { range curGrgit.resolve.toCommit('refs/remotes/origin/master'), curGrgit.resolve.toCommit('HEAD') }
-            if (unpushed) logger.lifecycle("--- ${unpushed.size()} commits unpushed (ahead of origin/master)")
-            for (Commit commit in unpushed) logger.lifecycle(" - ${commit.getAbbreviatedId(8)} - ${commit.shortMessage}")
             def curStatus = curGrgit.status()
             if (curStatus.isClean()) logger.lifecycle("* nothing to commit, working directory clean")
             if (curStatus.staged.added || curStatus.staged.modified || curStatus.staged.removed) logger.lifecycle("--- Changes to be committed::")
diff --git a/framework/build.gradle b/framework/build.gradle
index 8bc029de6..65137c15c 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -12,7 +12,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-version = '3.1.0-rc1'
+version = '3.1.0-rc2'
 
 apply plugin: 'java-library'
 apply plugin: 'groovy'
@@ -27,7 +27,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.45.0'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.47.0'
         // uncomment to add the Error Prone compiler: classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.8'
     }
 }
@@ -68,17 +68,17 @@ tasks.withType(GroovyCompile) { options.compilerArgs << "-proc:none" }
 // NOTE: for dependency types and 'api' definition see: https://docs.gradle.org/current/userguide/java_library_plugin.html
 dependencies {
     // Groovy
-    // NOTE: Groovy 3.0.10-3.0.12 has a bug that somehow causes EntityDefinition.isViewEntity (public final boolean) to switch
+    // NOTE: Groovy 3.0.10-3.0.18 has a bug that somehow causes EntityDefinition.isViewEntity (public final boolean) to switch
     //     from true during constructor to false later on; see EntityFindBuilder.java:112-114 and EntityDefinition.groovy:50-53,94-95;
     //     for now using Boolean instead of boolean to resolve, but staying at 3.0.9 to avoid risk with other code
-    api 'org.codehaus.groovy:groovy:3.0.9' // Apache 2.0
-    api 'org.codehaus.groovy:groovy-dateutil:3.0.9' // Apache 2.0
-    api 'org.codehaus.groovy:groovy-groovysh:3.0.9' // Apache 2.0
+    api 'org.codehaus.groovy:groovy:3.0.19' // Apache 2.0
+    api 'org.codehaus.groovy:groovy-dateutil:3.0.19' // Apache 2.0
+    api 'org.codehaus.groovy:groovy-groovysh:3.0.19' // Apache 2.0
     // jline, an older version, is required by groovy-groovysh but not in its dependencies
     implementation 'jline:jline:2.14.6' // BSD
-    api 'org.codehaus.groovy:groovy-json:3.0.9' // Apache 2.0
-    api 'org.codehaus.groovy:groovy-templates:3.0.9' // Apache 2.0
-    api 'org.codehaus.groovy:groovy-xml:3.0.9' // Apache 2.0
+    api 'org.codehaus.groovy:groovy-json:3.0.19' // Apache 2.0
+    api 'org.codehaus.groovy:groovy-templates:3.0.19' // Apache 2.0
+    api 'org.codehaus.groovy:groovy-xml:3.0.19' // Apache 2.0
     // jansi is needed for groovydoc only, so in compileOnly (not included in war) - don't update to version 2, keep at version 1 for compatibility
     compileOnly 'org.fusesource.jansi:jansi:1.18'
     // Findbugs need only during compile (used by freemarker and various moqui classes)
@@ -93,33 +93,33 @@ dependencies {
     // ========== General Libraries from Maven Central ==========
 
     // Apache Commons
-    api 'org.apache.commons:commons-csv:1.9.0' // Apache 2.0
+    api 'org.apache.commons:commons-csv:1.10.0' // Apache 2.0
     // NOTE: commons-email depends on com.sun.mail:javax.mail, included below, so use module() here to not get dependencies
     api module('org.apache.commons:commons-email:1.5') // Apache 2.0
-    api 'org.apache.commons:commons-lang3:3.12.0' // Apache 2.0; used by cron-utils
+    api 'org.apache.commons:commons-lang3:3.13.0' // Apache 2.0; used by cron-utils
     api 'commons-beanutils:commons-beanutils:1.9.4' // Apache 2.0
-    api 'commons-codec:commons-codec:1.15' // Apache 2.0
+    api 'commons-codec:commons-codec:1.16.0' // Apache 2.0
     api 'commons-collections:commons-collections:3.2.2' // Apache 2.0
     api 'commons-digester:commons-digester:2.1' // Apache 2.0
-    api 'commons-fileupload:commons-fileupload:1.4' // Apache 2.0
-    api 'commons-io:commons-io:2.11.0' // Apache 2.0
+    api 'commons-fileupload:commons-fileupload:1.5' // Apache 2.0
+    api 'commons-io:commons-io:2.13.0' // Apache 2.0
     api 'commons-logging:commons-logging:1.2' // Apache 2.0
     api 'commons-validator:commons-validator:1.7' // Apache 2.0
 
     // Cron Utils
-    api 'com.cronutils:cron-utils:9.2.0' // Apache 2.0
+    api 'com.cronutils:cron-utils:9.2.1' // Apache 2.0
 
     // Flexmark (markdown)
-    api 'com.vladsch.flexmark:flexmark:0.64.0'
-    api 'com.vladsch.flexmark:flexmark-ext-tables:0.64.0'
-    api 'com.vladsch.flexmark:flexmark-ext-toc:0.64.0'
+    api 'com.vladsch.flexmark:flexmark:0.64.8'
+    api 'com.vladsch.flexmark:flexmark-ext-tables:0.64.8'
+    api 'com.vladsch.flexmark:flexmark-ext-toc:0.64.8'
 
     // Freemarker
     // Remember to change the version number in FtlTemplateRenderer and MNode class when upgrading
     api 'org.freemarker:freemarker:2.3.32' // Apache 2.0
 
     // H2 Database
-    api 'com.h2database:h2:2.1.214' // MPL 2.0, EPL 1.0
+    api 'com.h2database:h2:2.2.222' // MPL 2.0, EPL 1.0
 
     // Java Specifications
     api 'javax.transaction:jta:1.1'
@@ -144,38 +144,38 @@ dependencies {
     api 'com.beust:jcommander:1.82'
 
     // Jackson Databind (JSON, etc)
-    api 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
+    api 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
 
     // Jetty HTTP Client and Proxy Servlet
-    api 'org.eclipse.jetty:jetty-client:10.0.13' // Apache 2.0
-    api 'org.eclipse.jetty:jetty-proxy:10.0.13' // Apache 2.0
+    api 'org.eclipse.jetty:jetty-client:10.0.16' // Apache 2.0
+    api 'org.eclipse.jetty:jetty-proxy:10.0.16' // Apache 2.0
 
     // javax.mail
     // NOTE: javax.mail depends on 'javax.activation:activation' which is the old package for 'javax.activation:javax.activation-api' used by jaxb-api
     api module('com.sun.mail:javax.mail:1.6.2') // CDDL
 
     // Joda Time (used by elasticsearch, aws)
-    api 'joda-time:joda-time:2.12.2' // Apache 2.0
+    api 'joda-time:joda-time:2.12.5' // Apache 2.0
 
     // JSoup (HTML parser, cleaner)
-    api 'org.jsoup:jsoup:1.15.3' // MIT
+    api 'org.jsoup:jsoup:1.16.1' // MIT
 
     // Apache Shiro
-    api module('org.apache.shiro:shiro-core:1.11.0') // Apache 2.0
-    api module('org.apache.shiro:shiro-web:1.11.0') // Apache 2.0
+    api module('org.apache.shiro:shiro-core:1.12.0') // Apache 2.0
+    api module('org.apache.shiro:shiro-web:1.12.0') // Apache 2.0
 
     // SLF4J, Log4j 2 (note Log4j 2 is used by various libraries, best not to replace it even if mostly possible with SLF4J)
-    api 'org.slf4j:slf4j-api:2.0.6'
-    implementation 'org.apache.logging.log4j:log4j-core:2.19.0'
-    implementation 'org.apache.logging.log4j:log4j-api:2.19.0'
-    runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.19.0'
-    runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl:2.19.0'
+    api 'org.slf4j:slf4j-api:2.0.9'
+    implementation 'org.apache.logging.log4j:log4j-core:2.20.0'
+    implementation 'org.apache.logging.log4j:log4j-api:2.20.0'
+    runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.20.0'
+    runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0'
 
     // SubEtha SMTP (module as depends on old javax.mail location; also uses SLF4J, activation included elsewhere)
     api module('org.subethamail:subethasmtp:3.1.7')
 
     // Snake YAML
-    api 'org.yaml:snakeyaml:1.33' // Apache 2.0
+    api 'org.yaml:snakeyaml:2.2' // Apache 2.0
 
     // Apache Jackrabbit - uncomment here or include elsewhere when Jackrabbit repository configurations are used
     // api 'org.apache.jackrabbit:jackrabbit-jcr-rmi:2.12.1' // Apache 2.0
@@ -190,11 +190,11 @@ dependencies {
     // ========== test dependencies ==========
 
     // junit-platform-launcher is a dependency from spock-core, included explicitly to get more recent version as needed
-    testImplementation 'org.junit.platform:junit-platform-launcher:1.9.2'
+    testImplementation 'org.junit.platform:junit-platform-launcher:1.10.0'
     // junit-platform-suite required for test suites to specify test class order, etc
-    testImplementation 'org.junit.platform:junit-platform-suite:1.9.2'
+    testImplementation 'org.junit.platform:junit-platform-suite:1.10.0'
     // junit-jupiter-api for using JUnit directly, not generally needed for Spock based tests
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
     // Spock Framework
     testImplementation platform("org.spockframework:spock-bom:2.1-groovy-3.0") // Apache 2.0
     testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' // Apache 2.0
@@ -203,16 +203,16 @@ dependencies {
 
     // ========== executable war dependencies ==========
     // Jetty
-    execWarRuntimeOnly 'org.eclipse.jetty:jetty-server:10.0.13' // Apache 2.0
-    execWarRuntimeOnly 'org.eclipse.jetty:jetty-webapp:10.0.13' // Apache 2.0
-    execWarRuntimeOnly 'org.eclipse.jetty:jetty-jndi:10.0.13' // Apache 2.0
-    execWarRuntimeOnly 'org.eclipse.jetty.websocket:websocket-javax-server:10.0.13' // Apache 2.0
-    execWarRuntimeOnly ('org.eclipse.jetty.websocket:websocket-javax-client:10.0.13') { // Apache 2.0
+    execWarRuntimeOnly 'org.eclipse.jetty:jetty-server:10.0.16' // Apache 2.0
+    execWarRuntimeOnly 'org.eclipse.jetty:jetty-webapp:10.0.16' // Apache 2.0
+    execWarRuntimeOnly 'org.eclipse.jetty:jetty-jndi:10.0.16' // Apache 2.0
+    execWarRuntimeOnly 'org.eclipse.jetty.websocket:websocket-javax-server:10.0.16' // Apache 2.0
+    execWarRuntimeOnly ('org.eclipse.jetty.websocket:websocket-javax-client:10.0.16') { // Apache 2.0
         exclude group: 'javax.websocket' } // we have the full websocket API, including the client one causes problems
     execWarRuntimeOnly 'javax.websocket:javax.websocket-api:1.1'
-    execWarRuntimeOnly ('org.eclipse.jetty.websocket:websocket-jetty-server:10.0.13') // Apache 2.0
+    execWarRuntimeOnly ('org.eclipse.jetty.websocket:websocket-jetty-server:10.0.16') // Apache 2.0
     // only include this if using Endpoint and MessageHandler annotations:
-    // execWarRuntime ('org.eclipse.jetty:jetty-annotations:10.0.13') // Apache 2.0
+    // execWarRuntime ('org.eclipse.jetty:jetty-annotations:10.0.16') // Apache 2.0
     execWarRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j18-impl:2.18.0'
 }
 
diff --git a/framework/entity/BasicEntities.xml b/framework/entity/BasicEntities.xml
index 3ca7a10e4..d71b77fc5 100644
--- a/framework/entity/BasicEntities.xml
+++ b/framework/entity/BasicEntities.xml
@@ -389,7 +389,9 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="uomId" type="id" is-pk="true"/>
         <field name="uomTypeEnumId" type="id"/>
         <field name="abbreviation" type="text-short"/>
-        <field name="description" type="text-medium"/>
+        <field name="description" type="text-medium" enable-localization="true"/>
+        <field name="fractionDigits" type="number-integer"/>
+        <field name="symbol" type="text-short" enable-localization="true"/>
         <relationship type="one" title="UomType" related="moqui.basic.Enumeration" short-alias="type">
             <key-map field-name="uomTypeEnumId"/></relationship>
         <relationship type="many" related="moqui.basic.UomConversion" short-alias="conversions">
diff --git a/framework/entity/ServerEntities.xml b/framework/entity/ServerEntities.xml
index 17ec6556d..e9b63af25 100644
--- a/framework/entity/ServerEntities.xml
+++ b/framework/entity/ServerEntities.xml
@@ -196,6 +196,9 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="username" type="text-short"/>
         <field name="password" type="text-medium" encrypt="true"/>
         <field name="emailAddress" type="text-medium"/>
+        <!-- To pull an image from a remote registryLocation, you may need to generate a token using a command example: AWS-ECR -->
+        <!-- Note: if you are using authTokenCmd to authenticate on registry then must keep the password field empty simply-->
+        <field name="authTokenCmd" type="text-medium"/>
         <relationship type="one" related="moqui.server.instance.InstanceImageType" short-alias="imageType"/>
         <relationship type="one" related="moqui.server.instance.InstanceHostType" short-alias="hostType"/>
     </entity>
diff --git a/framework/entity/ServiceEntities.xml b/framework/entity/ServiceEntities.xml
index 81696e90f..7b51a3ab3 100644
--- a/framework/entity/ServiceEntities.xml
+++ b/framework/entity/ServiceEntities.xml
@@ -383,6 +383,7 @@ along with this software (see the LICENSE.md file). If not, see
             <moqui.basic.Enumeration enumId="SmatNone" description="No Auth" enumTypeId="SystemMessageAuthType"/>
             <moqui.basic.Enumeration enumId="SmatLogin" description="User Login (basic, api_key, etc)" enumTypeId="SystemMessageAuthType"/>
             <moqui.basic.Enumeration enumId="SmatHmacSha256" description="HMAC SHA-256" enumTypeId="SystemMessageAuthType"/>
+            <moqui.basic.Enumeration enumId="SmatHmacSha256Timestamp" description="HMAC SHA-256 with Timestamp" enumTypeId="SystemMessageAuthType"/>
         </seed-data>
     </entity>
     <entity entity-name="SystemMessageEnumMap" package="moqui.service.message" use="configuration">
diff --git a/framework/service/org/moqui/impl/InstanceServices.xml b/framework/service/org/moqui/impl/InstanceServices.xml
index 7071d77fa..dacbd18ca 100644
--- a/framework/service/org/moqui/impl/InstanceServices.xml
+++ b/framework/service/org/moqui/impl/InstanceServices.xml
@@ -214,8 +214,13 @@ along with this software (see the LICENSE.md file). If not, see
             <entity-find-one entity-name="moqui.server.instance.AppInstance" value-field="appInstance"/>
             <set field="hostType" from="appInstance?.instanceHost?.hostType"/>
             <if condition="hostType == null"><return error="true" message="No InstanceHostType found for AppInstance with ID ${appInstanceId}"/></if>
-            <service-call name="${hostType.initService}" in-map="context" out-map="context"/>
-        </actions>
+            <!-- <service-call name="${hostType.initService}" in-map="context" out-map="context"/>-->
+            <!--For async call -->
+            <script><![CDATA[
+            import org.moqui.context.ExecutionContext
+            import java.util.concurrent.Future
+            Future<Map> instanceFuture = ec.service.async().name("${hostType.initService}").parameters([context:context,appInstanceId:appInstanceId]).callFuture()
+        ]]></script></actions>
     </service>
     <service verb="start" noun="AppInstance">
         <implements service="org.moqui.impl.InstanceServices.start#Instance"/>
@@ -281,8 +286,9 @@ along with this software (see the LICENSE.md file). If not, see
         - https://docs.docker.com/engine/security/https/
     -->
 
-    <service verb="init" noun="InstanceDocker">
+    <service verb="init" noun="InstanceDocker" transaction-timeout="1500" >
         <!-- see https://docs.docker.com/engine/reference/api/docker_remote_api_v1.24/#/create-a-container -->
+        <!-- https://docs.docker.com/engine/api/v1.24/#create-an-image -->
         <implements service="org.moqui.impl.InstanceServices.init#Instance"/>
         <actions><script><![CDATA[
             import groovy.json.JsonSlurper
@@ -290,6 +296,11 @@ along with this software (see the LICENSE.md file). If not, see
             import org.moqui.context.ExecutionContext
             import org.moqui.entity.EntityValue
             import org.moqui.util.RestClient
+            import java.util.concurrent.Future
+            import java.io.BufferedReader
+            import java.io.InputStreamReader
+            import java.io.IOException
+            import groovy.json.JsonOutput
 
             connectSuccess = null
             instanceCreated = false
@@ -348,6 +359,46 @@ along with this software (see the LICENSE.md file). If not, see
             ec.logger.info("Initializing docker container for ${appInstance.instanceName} with:\n${jsonBody}")
             restClient.jsonObject(jsonBody)
 
+            try {
+                authTokenPass = null
+                if (instanceImage.authTokenCmd) {
+                    try {
+                        Process processCmd = Runtime.getRuntime().exec((instanceImage.authTokenCmd).split(" "), null)
+                        BufferedReader readToken = new BufferedReader(new InputStreamReader(processCmd.getInputStream()))
+                        authTokenPass = readToken.readLine()
+                    }
+                    catch (IOException io) {
+                        authTokenPass = null
+                        ec.logger.log(ec.logger.ERROR_INT, "Error connecting to Docker host in processing aws cmd", io)
+                        ec.message.addError("Error connecting to Docker host: ${io.toString()}")
+                    }
+
+                }
+                else {
+                    authTokenPass = instanceImage.password
+                }
+                Map jsonAuth = [username: instanceImage.username , password: authTokenPass , email: instanceImage.emailAddress , serveraddress: instanceImage.registryLocation ]
+                //Registry-Location now using as Server-Address
+                String json = (String) JsonOutput.toJson(jsonAuth)
+                String authEncoded = Base64.getEncoder().encodeToString(json.getBytes())
+                Map param = [fromImage:(String) instanceImage.imageName ,repo : (String)instanceImage.imageName]
+                RestClient restClientImageCreate = ec.service.rest().method("POST").addHeader((String)("X-Registry-Auth"),(String) authEncoded)
+                restClientImageCreate.uri().protocol(instanceHost.hostProtocol ? (String) instanceHost.hostProtocol : "http")
+                .host(instanceHost.hostAddress as String).port(instanceHost.adminPort ? (instanceHost.adminPort as int) : 2375)
+                .path("images").path("create")
+                .parameters(param).build()
+                restClientImageCreate.timeout(1000)
+
+                RestClient.RestResponse restResponseImageCreate = restClientImageCreate.call()
+                if (restResponseImageCreate.statusCode != 200) {
+                     ec.message.addMessage("Error Image-pull-fail problem image not-exists either or credential is wrong (${restResponseImageCreate.statusCode}): ${restResponseImageCreate.getReasonPhrase()}")
+                }
+            } catch (Exception e) {
+                connectSuccess = false
+                ec.logger.log(ec.logger.ERROR_INT, "Error connecting to Docker host", e)
+                ec.message.addError("Error connecting to Docker host: ${e.toString()}")
+            }
+
             try {
                 RestClient.RestResponse restResponse = restClient.call()
                 connectSuccess = true
@@ -370,6 +421,9 @@ along with this software (see the LICENSE.md file). If not, see
                     instanceExists = true
                     ec.logger.warn("Docker container ${appInstance.instanceName} (${appInstance.instanceUuid}) conflict [${restResponse.getReasonPhrase()}]:\n${restResponse.text()}")
                     ec.message.addMessage("Docker container ${appInstance.instanceName} (${appInstance.instanceUuid}) got a conflict on create [${restResponse.getReasonPhrase()}]")
+                } else if (restResponse.statusCode == 404) {
+                    // POST /v1.24/images/create?fromImage=busybox&tag=latest HTTP/1.1
+                    ec.message.addMessage("Image not Found ,or may be Docker login fail")
                 } else {
                     ec.logger.error("Docker container ${appInstance.instanceName} (${appInstance.instanceUuid}) ERROR [${restResponse.getReasonPhrase()}]:\n${restResponse.text()}")
                     ec.message.addMessage("Error on create container for ${appInstance.instanceName} (${restResponse.statusCode}): ${restResponse.getReasonPhrase()}")
diff --git a/framework/src/main/groovy/org/moqui/impl/context/ContextJavaUtil.java b/framework/src/main/groovy/org/moqui/impl/context/ContextJavaUtil.java
index 9f2321e38..ee4a33b44 100644
--- a/framework/src/main/groovy/org/moqui/impl/context/ContextJavaUtil.java
+++ b/framework/src/main/groovy/org/moqui/impl/context/ContextJavaUtil.java
@@ -729,7 +729,8 @@ public CustomScheduledTask(Callable<V> callable, RunnableScheduledFuture<V> futu
 
         @Override public V get() throws InterruptedException, ExecutionException { return future.get(); }
         @Override public V get(long l, @NotNull TimeUnit timeUnit) throws InterruptedException, ExecutionException, TimeoutException {
-            return get(l, timeUnit); }
+            return future.get(l, timeUnit);
+        }
 
         @Override public String toString() {
             return "CustomScheduledTask " + (runnable != null ? runnable.getClass().getName() : (callable != null ? callable.getClass().getName() : "[no Runnable or Callable!]"));
diff --git a/framework/src/main/groovy/org/moqui/impl/context/ElasticFacadeImpl.groovy b/framework/src/main/groovy/org/moqui/impl/context/ElasticFacadeImpl.groovy
index 3155ec965..40c603096 100644
--- a/framework/src/main/groovy/org/moqui/impl/context/ElasticFacadeImpl.groovy
+++ b/framework/src/main/groovy/org/moqui/impl/context/ElasticFacadeImpl.groovy
@@ -348,7 +348,7 @@ class ElasticFacadeImpl implements ElasticFacade {
             for (Map entry in actionSourceList) {
                 // look for _index fields in each Map, if found prefix
                 if (entry.size() == 1) {
-                    Map actionMap = entry.values().first()
+                    Map actionMap = (Map) entry.values().first()
                     Object _indexVal = actionMap.get("_index")
                     if (_indexVal != null && _indexVal instanceof String) actionMap.put("_index", prefixIndexName((String) _indexVal))
                 }
diff --git a/framework/src/main/groovy/org/moqui/impl/context/L10nFacadeImpl.java b/framework/src/main/groovy/org/moqui/impl/context/L10nFacadeImpl.java
index acec7f13f..b273984b5 100644
--- a/framework/src/main/groovy/org/moqui/impl/context/L10nFacadeImpl.java
+++ b/framework/src/main/groovy/org/moqui/impl/context/L10nFacadeImpl.java
@@ -15,6 +15,7 @@
 
 import org.moqui.BaseArtifactException;
 import org.moqui.context.L10nFacade;
+import org.moqui.entity.EntityCondition;
 import org.moqui.entity.EntityValue;
 import org.moqui.entity.EntityFind;
 
@@ -23,6 +24,8 @@
 import javax.xml.bind.DatatypeConverter;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
 import java.sql.Date;
 import java.sql.Time;
@@ -100,13 +103,14 @@ public String localize(String original, Locale locale) {
     }
 
     @Override
-    public String formatCurrency(Object amount, String uomId) { return formatCurrency(amount, uomId, null, getLocale()); }
+    public String formatCurrencyNoSymbol(Object amount, String uomId) { return formatCurrency(amount, uomId, null, getLocale(), true); }
     @Override
-    public String formatCurrency(Object amount, String uomId, Integer fractionDigits) {
-        return formatCurrency(amount, uomId, fractionDigits, getLocale());
-    }
+    public String formatCurrency(Object amount, String uomId) { return formatCurrency(amount, uomId, null, getLocale(), false); }
+    @Override
+    public String formatCurrency(Object amount, String uomId, Integer fractionDigits) { return formatCurrency(amount, uomId, fractionDigits, getLocale(), false); }
     @Override
-    public String formatCurrency(Object amount, String uomId, Integer fractionDigits, Locale locale) {
+    public String formatCurrency(Object amount, String uomId, Integer fractionDigits, Locale locale) { return formatCurrency(amount, uomId, fractionDigits, locale, false); }
+    public String formatCurrency(Object amount, String uomId, Integer fractionDigits, Locale locale, boolean hideSymbol) {
         if (amount == null) return "";
         if (amount instanceof CharSequence) {
             if (((CharSequence) amount).length() == 0) {
@@ -116,30 +120,54 @@ public String formatCurrency(Object amount, String uomId, Integer fractionDigits
             }
         }
 
+        if (locale == null) locale = getLocale();
+        NumberFormat nf = NumberFormat.getCurrencyInstance(locale);
+        String currencySymbol = null;
+        if (hideSymbol)
+            currencySymbol = "";
+        EntityValue uom = null;
+        if (uomId != null && uomId.length() > 0) {
+            List<EntityValue> uomList = eci.getEntity().find("moqui.basic.Uom").condition("uomId", uomId)
+                    .condition("uomTypeEnumId", "UT_CURRENCY_MEASURE").disableAuthz().list();
+            if (uomList.size() > 0) {
+                uom = uomList.get(0);
+                String symbol = uom.getString("symbol");
+                if (currencySymbol == null && symbol != null)
+                    currencySymbol = symbol;
+                Object fractionDigitsField = uom.get("fractionDigits");
+                if (fractionDigits == null && fractionDigitsField != null) {
+                    if (fractionDigitsField instanceof Integer)
+                        fractionDigits = (Integer)fractionDigitsField;
+                    else if (fractionDigitsField instanceof Long)
+                        fractionDigits = ((Long)fractionDigitsField).intValue();
+                }
+            }
+        }
+
         Currency currency = null;
         if (uomId != null && uomId.length() > 0) {
             try {
                 currency = Currency.getInstance(uomId);
+                if (currencySymbol == null)
+                    currencySymbol = currency.getSymbol();
+                if (fractionDigits == null)
+                    fractionDigits = currency.getDefaultFractionDigits();
             } catch (Exception e) {
                 if (logger.isTraceEnabled()) logger.trace("Ignoring IllegalArgumentException for Currency parse: " + e.toString());
             }
         }
-
-        if (locale == null) locale = getLocale();
-        if (currency != null) {
-            NumberFormat nf = NumberFormat.getCurrencyInstance(locale);
-            nf.setCurrency(currency);
-            if (fractionDigits == null) fractionDigits = currency.getDefaultFractionDigits();
-            nf.setMaximumFractionDigits(fractionDigits);
-            nf.setMinimumFractionDigits(fractionDigits);
-            return nf.format(amount);
-        } else {
-            NumberFormat nf = NumberFormat.getInstance();
-            if (fractionDigits == null) fractionDigits = 2;
-            nf.setMaximumFractionDigits(fractionDigits);
-            nf.setMinimumFractionDigits(fractionDigits);
-            return nf.format(amount);
-        }
+        if (currencySymbol == null)
+            currencySymbol = "";
+
+        if (fractionDigits == null)
+            fractionDigits = 2;
+        nf.setMaximumFractionDigits(fractionDigits);
+        nf.setMinimumFractionDigits(fractionDigits);
+        DecimalFormatSymbols dfSymbols = new DecimalFormatSymbols(locale);
+        dfSymbols.setCurrencySymbol(currencySymbol);
+        ((DecimalFormat)nf).setDecimalFormatSymbols(dfSymbols);
+
+        return nf.format(amount);
     }
 
     @Override
@@ -152,10 +180,29 @@ public BigDecimal roundCurrency(BigDecimal amount, String uomId, boolean precise
     }
     @Override
     public BigDecimal roundCurrency(BigDecimal amount, String uomId, boolean precise, RoundingMode mode) {
-        Currency currency = Currency.getInstance(uomId);
-        int nDigits = currency.getDefaultFractionDigits();
-        if (precise) nDigits++;
-        return amount.setScale(nDigits, mode);
+        if (amount == null)
+            return null;
+        List<EntityValue> uomList = eci.getEntity().find("moqui.basic.Uom").condition("uomId", uomId).condition("uomTypeEnumId", "UT_CURRENCY_MEASURE").list();
+        Integer fractionDigits = null;
+        if (uomList.size() > 0) {
+            Object fractionDigitsField = uomList.get(0).get("fractionDigits");
+            if (fractionDigitsField != null) {
+                if (fractionDigitsField instanceof Integer)
+                    fractionDigits = (Integer)fractionDigitsField;
+                else if (fractionDigitsField instanceof Long)
+                    fractionDigits = ((Long)fractionDigitsField).intValue();
+            }
+        }
+        if (fractionDigits == null) {
+            Currency currency = Currency.getInstance(uomId);
+            fractionDigits = currency.getDefaultFractionDigits();
+        }
+        if (fractionDigits == null) {
+            fractionDigits = 2;
+        }
+        if (precise) fractionDigits++;
+        eci.getLogger().info("Rounding to " + fractionDigits + " digits.");
+        return amount.setScale(fractionDigits, mode);
     }
 
     @Override
diff --git a/framework/src/main/groovy/org/moqui/impl/context/WebFacadeImpl.groovy b/framework/src/main/groovy/org/moqui/impl/context/WebFacadeImpl.groovy
index 8fdf52158..a1b4e4b1d 100644
--- a/framework/src/main/groovy/org/moqui/impl/context/WebFacadeImpl.groovy
+++ b/framework/src/main/groovy/org/moqui/impl/context/WebFacadeImpl.groovy
@@ -49,6 +49,8 @@ import javax.servlet.ServletContext
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
 import javax.servlet.http.HttpSession
+import java.nio.charset.StandardCharsets
+import java.sql.Timestamp
 
 /** This class is a facade to easily get information from and about the web context. */
 @CompileStatic
@@ -1210,6 +1212,70 @@ class WebFacadeImpl implements WebFacade {
                     return
                 }
 
+                // login anonymous if not logged in
+                eci.userFacade.loginAnonymousIfNoUser()
+            } else if ("SmatHmacSha256Timestamp".equals(messageAuthEnumId)) {
+                // validate HMAC value from authHeaderName HTTP header using sharedSecret and messageText
+                String authHeaderName = (String) systemMessageRemote.authHeaderName
+                String sharedSecret = (String) systemMessageRemote.sharedSecret
+
+                String headerValue = request.getHeader(authHeaderName)
+                if (!headerValue) {
+                    logger.warn("System message receive HMAC verify no header ${authHeaderName} value found, for remote ${systemMessageRemoteId}")
+                    response.sendError(HttpServletResponse.SC_FORBIDDEN, "No HMAC header ${authHeaderName} found for remote system ${systemMessageRemoteId}")
+                    return
+                }
+
+                // This assumes a header format like
+                // Example-Signature-Header:
+                //t=1492774577,
+                //v1=5257a869e7ecebeda32affa62cdca3fa51cad7e77a0e56ff536d0ce8e108d8bd
+                // We’ve added newlines for clarity, but a realExample-Signature-Header is on a single line.
+                String timestamp = null;
+                String incomingSignature = null;
+                String[] headerValueList = headerValue.split(",") // split on comma
+                for (String headerValueItem : headerValueList) {
+                    String key = headerValueItem.split("=")[0].trim()
+                    if ("t".equals(key))
+                        timestamp = headerValueItem.split("=")[1].trim()
+                    else if ("v1".equals(key))
+                        incomingSignature = headerValueItem.split("=")[1].trim()
+                }
+
+                // This also assumes that the signature is generated from the following concatenated strings:
+                // Timestamp in the header
+                // The character .
+                // The text body of the request
+                String signatureTextToVerify = timestamp + "." + messageText
+
+                Mac hmac = Mac.getInstance("HmacSHA256")
+                hmac.init(new SecretKeySpec(sharedSecret.getBytes(StandardCharsets.UTF_8), "HmacSHA256"))
+                // NOTE: if this fails try with "ISO-8859-1"
+                byte[] hash = hmac.doFinal(signatureTextToVerify.getBytes(StandardCharsets.UTF_8));
+                String signature = ""
+                for (byte b : hash) {
+                    // Came from https://github.com/stripe/stripe-java/blob/3686feb8f2067878b7bb4619f931580a3d31bf4f/src/main/java/com/stripe/net/Webhook.java#L187
+                    signature += Integer.toString((b & 0xff) + 0x100, 16).substring(1);
+                }
+
+                if (incomingSignature != signature) {
+                    logger.warn("System message receive HMAC verify header value ${incomingSignature} calculated ${signature} did not match for remote ${systemMessageRemoteId}")
+                    response.sendError(HttpServletResponse.SC_FORBIDDEN, "HMAC verify failed for remote system ${systemMessageRemoteId}")
+                    return
+                }
+
+                Timestamp incomingTimestamp = new Timestamp(Long.parseLong(timestamp) * 1000)
+
+                // Add 10 seconds to now timestamp to allow for clock skew (10 seconds = 10000 milliseconds = 10*1000)
+                Timestamp nowTimestamp = new Timestamp(eci.user.nowTimestamp.getTime() + 10000)
+                // If timestamp was not sent in past 5 minutes, reject message (5 minutes = 300000 milliseconds = 5*60*1000)
+                Timestamp beforeTimestamp = new Timestamp(nowTimestamp.getTime() - 300000)
+                if (!incomingTimestamp.before(nowTimestamp) || !incomingTimestamp.after(beforeTimestamp) ){
+                    logger.warn("System message receive HMAC invalid incoming timestamp where before timestamp ${beforeTimestamp} < incoming timestamp ${incomingTimestamp} < now timestamp ${nowTimestamp}" )
+                    response.sendError(HttpServletResponse.SC_FORBIDDEN, "HMAC timestamp verification failed")
+                    return
+                }
+
                 // login anonymous if not logged in
                 eci.userFacade.loginAnonymousIfNoUser()
             } else if (!"SmatNone".equals(messageAuthEnumId)) {
diff --git a/framework/src/main/groovy/org/moqui/impl/entity/EntityDbMeta.groovy b/framework/src/main/groovy/org/moqui/impl/entity/EntityDbMeta.groovy
index da1e61d50..d487e7de6 100644
--- a/framework/src/main/groovy/org/moqui/impl/entity/EntityDbMeta.groovy
+++ b/framework/src/main/groovy/org/moqui/impl/entity/EntityDbMeta.groovy
@@ -107,7 +107,7 @@ class EntityDbMeta {
         String schemaName = datasourceNode != null ? datasourceNode.attribute("schema-name") : null
         Set<String> groupEntityNames = efi.getAllEntityNamesInGroup(groupName)
 
-        String[] types = ["TABLE", "VIEW", "ALIAS", "SYNONYM"]
+        String[] types = ["TABLE", "VIEW", "ALIAS", "SYNONYM", "PARTITIONED TABLE"]
         Set<String> existingTableNames = new HashSet<>()
 
         boolean beganTx = useTxForMetaData ? efi.ecfi.transactionFacade.begin(300) : false
@@ -458,7 +458,7 @@ class EntityDbMeta {
                 con = efi.getConnection(groupName)
                 DatabaseMetaData dbData = con.getMetaData()
 
-                String[] types = ["TABLE", "VIEW", "ALIAS", "SYNONYM"]
+                String[] types = ["TABLE", "VIEW", "ALIAS", "SYNONYM", "PARTITIONED TABLE"]
                 tableSet1 = dbData.getTables(con.getCatalog(), ed.getSchemaName(), ed.getTableName(), types)
                 if (tableSet1.next()) {
                     dbResult = true
diff --git a/framework/src/main/groovy/org/moqui/impl/screen/ScreenRenderImpl.groovy b/framework/src/main/groovy/org/moqui/impl/screen/ScreenRenderImpl.groovy
index 780100970..eb40bf57d 100644
--- a/framework/src/main/groovy/org/moqui/impl/screen/ScreenRenderImpl.groovy
+++ b/framework/src/main/groovy/org/moqui/impl/screen/ScreenRenderImpl.groovy
@@ -1427,7 +1427,7 @@ class ScreenRenderImpl implements ScreenRender {
     String pushContext() { ec.contextStack.push(); return "" }
     String popContext() { ec.contextStack.pop(); return "" }
 
-    /** Call this at the beginning of a form-single or for form-list.@first-row-map and @last-row-map. Always call popContext() at the end of the form! */
+    /** Call this at the beginning of a form-single or for form-list.@map-first-row and @map-last-row. Always call popContext() at the end of the form! */
     String pushSingleFormMapContext(String mapExpr) {
         ContextStack cs = ec.contextStack
         Map valueMap = null
@@ -1441,6 +1441,13 @@ class ScreenRenderImpl implements ScreenRender {
 
         return ""
     }
+    Map getSingleFormMap(String mapExpr) {
+        Map valueMap = null
+        if (mapExpr != null && !mapExpr.isEmpty()) valueMap = (Map) ec.resourceFacade.expression(mapExpr, null)
+        if (valueMap instanceof EntityValue) valueMap = ((EntityValue) valueMap).getMap()
+        if (valueMap == null) valueMap = new HashMap()
+        return valueMap
+    }
     String startFormListRow(ScreenForm.FormListRenderInfo listRenderInfo, Object listEntry, int index, boolean hasNext) {
         ContextStack cs = ec.contextStack
         cs.push()
@@ -1658,7 +1665,7 @@ class ScreenRenderImpl implements ScreenRender {
         int afnSize = allFieldNodes.size()
         for (int i = 0; i < afnSize; i++) {
             MNode fieldNode = (MNode) allFieldNodes.get(i)
-            addFormFieldValue(fieldNode, fieldValues, false)
+            addFormFieldValue(fieldNode, fieldValues, (char) 'r')
         }
         return fieldValues
     }
@@ -1673,7 +1680,7 @@ class ScreenRenderImpl implements ScreenRender {
         int afnSize = allFieldNodes.size()
         for (int i = 0; i < afnSize; i++) {
             MNode fieldNode = (MNode) allFieldNodes.get(i)
-            addFormFieldValue(fieldNode, fieldValues, true)
+            addFormFieldValue(fieldNode, fieldValues, (char) 'h')
         }
 
         // add orderByField
@@ -1706,11 +1713,11 @@ class ScreenRenderImpl implements ScreenRender {
         ArrayList<Map<String, Object>> outRows = new ArrayList<>(rowsSize)
         for (int ri = 0; ri < rowsSize; ri++) {
             Map<String, Object> row = (Map<String, Object>) listObject.get(ri)
-            outRows.add(transformFormListRow(renderInfo, row))
+            outRows.add(transformFormListRow(renderInfo, row, (char) 'r'))
         }
         return outRows
     }
-    Map<String, Object> transformFormListRow(ScreenForm.FormListRenderInfo renderInfo, Map<String, Object> row) {
+    Map<String, Object> transformFormListRow(ScreenForm.FormListRenderInfo renderInfo, Map<String, Object> row, char rowType) {
         ArrayList<MNode> fieldNodeList = renderInfo.getFormNode().children("field")
         int fieldNodeListSize = fieldNodeList.size()
         Set<String> displayedFields = renderInfo.getDisplayedFields()
@@ -1730,7 +1737,7 @@ class ScreenRenderImpl implements ScreenRender {
                 cs.push(row)
                 cs.push()
                 try {
-                    addFormFieldValue(fieldNode, outRow, false)
+                    addFormFieldValue(fieldNode, outRow, rowType)
                 } finally {
                     cs.pop()
                     cs.pop()
@@ -1742,12 +1749,18 @@ class ScreenRenderImpl implements ScreenRender {
     }
 
     // NOTE: this takes a fieldValues Map as a parameter to populate because a singe form field may have multiple values
-    void addFormFieldValue(MNode fieldNode, Map<String, Object> fieldValues, boolean useHeader) {
+    void addFormFieldValue(MNode fieldNode, Map<String, Object> fieldValues, char rowType) {
         String fieldName = fieldNode.attribute("name")
 
         MNode activeSubNode = (MNode) null
-        if (useHeader) {
+        if (rowType == (char) 'h') {
             activeSubNode = fieldNode.first("header-field")
+        } else if (rowType == (char) 'f') {
+            activeSubNode = fieldNode.first("first-row-field")
+        } else if (rowType == (char) 's') {
+            activeSubNode = fieldNode.first("second-row-field")
+        } else if (rowType == (char) 'l') {
+            activeSubNode = fieldNode.first("last-row-field")
         } else {
             ArrayList<MNode> condFieldNodeList = fieldNode.children("conditional-field")
             for (int j = 0; j < condFieldNodeList.size(); j++) {
@@ -1810,6 +1823,7 @@ class ScreenRenderImpl implements ScreenRender {
                 String fieldValue = (String) null
                 String textAttr = widgetNode.attribute("text")
                 String currencyAttr = widgetNode.attribute("currency-unit-field")
+                String currencyNoSymbolAttr = widgetNode.attribute("currency-hide-symbol")
                 if (textAttr != null && ! textAttr.isEmpty()) {
                     String textMapAttr = widgetNode.attribute("text-map")
                     Map textMap = (Map) null
@@ -1820,9 +1834,16 @@ class ScreenRenderImpl implements ScreenRender {
                     } else {
                         fieldValue = ec.resourceFacade.expand(textAttr, null)
                     }
-                    if (currencyAttr != null && !currencyAttr.isEmpty())
-                        fieldValue = ec.l10nFacade.formatCurrency(fieldValue, ec.resourceFacade.expression(currencyAttr, null) as String)
+                    if (currencyAttr != null && !currencyAttr.isEmpty()) {
+                        if (currencyNoSymbolAttr == "true")
+                            fieldValue = ec.l10nFacade.formatCurrencyNoSymbol(fieldValue, ec.resourceFacade.expression(currencyAttr, null) as String)
+                        else
+                            fieldValue = ec.l10nFacade.formatCurrency(fieldValue, ec.resourceFacade.expression(currencyAttr, null) as String)
+                    }
                 } else if (currencyAttr != null && !currencyAttr.isEmpty()) {
+                    if (currencyNoSymbolAttr == "true")
+                        fieldValue = ec.l10nFacade.formatCurrencyNoSymbol(getFieldValue(fieldNode, ""), ec.resourceFacade.expression(currencyAttr, null) as String)
+                    else
                     fieldValue = ec.l10nFacade.formatCurrency(getFieldValue(fieldNode, ""), ec.resourceFacade.expression(currencyAttr, null) as String)
                 } else {
                     fieldValue = getFieldValueString(widgetNode)
@@ -2037,7 +2058,8 @@ class ScreenRenderImpl implements ScreenRender {
         return transValue
     }
 
-    Map<String, Object> makeFormListSingleMap(ScreenForm.FormListRenderInfo renderInfo, Map<String, Object> listEntry, UrlInstance formTransitionUrl) {
+    Map<String, Object> makeFormListSingleMap(ScreenForm.FormListRenderInfo renderInfo, Map<String, Object> listEntry,
+            UrlInstance formTransitionUrl, String rowType) {
         MNode formNode = renderInfo.getFormNode()
         Map<String, Object> outMap = new LinkedHashMap<>()
 
@@ -2046,7 +2068,7 @@ class ScreenRenderImpl implements ScreenRender {
         outMap.putAll(getFormHiddenParameters(formNode))
 
         // listEntry fields before boilerplate fields below
-        Map<String, Object> row = transformFormListRow(renderInfo, listEntry)
+        Map<String, Object> row = transformFormListRow(renderInfo, listEntry, rowType.charAt(0))
         outMap.putAll(row)
 
         outMap.put("moquiFormName", formNode.attribute("name"))
@@ -2056,7 +2078,8 @@ class ScreenRenderImpl implements ScreenRender {
 
         return outMap
     }
-    Map<String, Object> makeFormListMultiMap(ScreenForm.FormListRenderInfo renderInfo, ArrayList<Map<String, Object>> listObject, UrlInstance formTransitionUrl) {
+    Map<String, Object> makeFormListMultiMap(ScreenForm.FormListRenderInfo renderInfo,
+            ArrayList<Map<String, Object>> listObject, UrlInstance formTransitionUrl) {
         MNode formNode = renderInfo.getFormNode()
         Map<String, Object> outMap = new LinkedHashMap<>()
 
@@ -2068,7 +2091,7 @@ class ScreenRenderImpl implements ScreenRender {
         int listSize = listObject.size()
         for (int i = 0; i < listSize; i++) {
             Map<String, Object> listEntry = (Map<String, Object>) listObject.get(i)
-            Map<String, Object> row = transformFormListRow(renderInfo, listEntry)
+            Map<String, Object> row = transformFormListRow(renderInfo, listEntry, (char) 'r')
             for (Map.Entry<String, Object> mapEntry in row.entrySet()) {
                 outMap.put(mapEntry.getKey() + "_" + i, mapEntry.getValue())
             }
@@ -2347,6 +2370,7 @@ class ScreenRenderImpl implements ScreenRender {
                 boolean active = (nextItem == subscreensItem.name)
                 Map itemMap = [name:subscreensItem.name, title:ec.resource.expand(subscreensItem.menuTitle, ""),
                                path:screenPath, pathWithParams:pathWithParams, image:image, imageType:imageType]
+                if (subscreensItem.menuInclude) itemMap.menuInclude = true
                 if (active) itemMap.active = true
                 if (screenUrlInstance.disableLink) itemMap.disableLink = true
                 subscreensList.add(itemMap)
diff --git a/framework/src/main/groovy/org/moqui/impl/service/runner/EntityAutoServiceRunner.groovy b/framework/src/main/groovy/org/moqui/impl/service/runner/EntityAutoServiceRunner.groovy
index 58b5fbe51..e84b4c405 100644
--- a/framework/src/main/groovy/org/moqui/impl/service/runner/EntityAutoServiceRunner.groovy
+++ b/framework/src/main/groovy/org/moqui/impl/service/runner/EntityAutoServiceRunner.groovy
@@ -533,7 +533,6 @@ class EntityAutoServiceRunner implements ServiceRunner {
             if ("*".equals(newParms.get(fieldName))) {
                 hasWildcard = true
                 newParms.remove(fieldName)
-                break
             }
         }
         if (hasWildcard) {
diff --git a/framework/src/main/java/org/moqui/context/L10nFacade.java b/framework/src/main/java/org/moqui/context/L10nFacade.java
index 235a9cf14..f2597e5d0 100644
--- a/framework/src/main/java/org/moqui/context/L10nFacade.java
+++ b/framework/src/main/java/org/moqui/context/L10nFacade.java
@@ -41,11 +41,16 @@ public interface L10nFacade {
      * @param uomId The uomId (ISO currency code), required.
      * @param fractionDigits Number of digits after the decimal point to display. If null defaults to number defined
      *                       by java.util.Currency.defaultFractionDigits() for the specified currency in uomId.
+     * @param locale Locale to use for formatting.
+     * @param hideSymbol option to hide the Symbol of the currency and only display the number formatted according
+     *                   to locale.
      * @return The formatted currency amount.
      */
+    String formatCurrency(Object amount, String uomId, Integer fractionDigits, Locale locale, boolean hideSymbol);
+    String formatCurrency(Object amount, String uomId, Integer fractionDigits, Locale locale);
     String formatCurrency(Object amount, String uomId, Integer fractionDigits);
     String formatCurrency(Object amount, String uomId);
-    String formatCurrency(Object amount, String uomId, Integer fractionDigits, Locale locale);
+    String formatCurrencyNoSymbol(Object amount, String uomId);
 
     /** Round currency according to the currency's specified amount of digits and rounding method.
      * @param amount The amount in BigDecimal to be rounded.
diff --git a/framework/src/test/groovy/L10nFacadeTests.groovy b/framework/src/test/groovy/L10nFacadeTests.groovy
index fbe4feef0..746015e09 100644
--- a/framework/src/test/groovy/L10nFacadeTests.groovy
+++ b/framework/src/test/groovy/L10nFacadeTests.groovy
@@ -98,7 +98,7 @@ class L10nFacadeTests extends Specification {
         ec.l10n.formatCurrency(new BigDecimal("12.34"), "USD", 2) == '$12.34'
         ec.l10n.formatCurrency(new BigDecimal("43.21"), "GBP", 2) in ["GBP43.21", "£43.21"]
         ec.user.setLocale(Locale.UK)
-        ec.l10n.formatCurrency(new BigDecimal("12.34"), "USD", 2) in ["USD12.34", 'US$12.34']
+        ec.l10n.formatCurrency(new BigDecimal("12.34"), "USD", 2) in ["USD12.34", '$12.34']
         ec.l10n.formatCurrency(new BigDecimal("43.21"), "GBP", 2) == "\u00A343.21"
 
         cleanup:
diff --git a/framework/xsd/xml-form-3.xsd b/framework/xsd/xml-form-3.xsd
index eb3f22562..c2fe0937b 100644
--- a/framework/xsd/xml-form-3.xsd
+++ b/framework/xsd/xml-form-3.xsd
@@ -897,6 +897,10 @@ along with this software (see the LICENSE.md file). If not, see
             <xs:annotation><xs:documentation>Specifies the currency uomId (ISO code) used to format the value.
             Will only format as currency if this is specified.</xs:documentation></xs:annotation>
         </xs:attribute>
+        <xs:attribute name="currency-hide-symbol" default="false" type="xs:string">
+            <xs:annotation><xs:documentation>When currency-unit-field has value, defines whether currency symbol will be
+            hidden or displayed normally.</xs:documentation></xs:annotation>
+        </xs:attribute>
         <xs:attribute name="format" type="xs:string">
             <xs:annotation><xs:documentation>Used to format the output of Number/Time/Date/Timestamp/etc objects.
                 With auto-fields-service will inherit from service parameter.</xs:documentation></xs:annotation>
@@ -1088,6 +1092,10 @@ along with this software (see the LICENSE.md file). If not, see
             <xs:annotation><xs:documentation>If applicable for the editor-type a screenThemeId for the CSS
                 (resourceTypeEnumId=STRT_STYLESHEET) files to use for the editor context, defaults to active screen theme.</xs:documentation></xs:annotation>
         </xs:attribute>
+        <xs:attribute name="autogrow" default="false" type="boolean">
+            <xs:annotation><xs:documentation>Auto-grow the text area to fit the contents;
+                currently only supported in qvt mode (Vue + Quasar)</xs:documentation></xs:annotation>
+        </xs:attribute>
     </xs:complexType></xs:element>
     <xs:element name="text-find" substitutionGroup="SubFields"><xs:complexType>
         <xs:attribute name="size" type="xs:positiveInteger" default="30"/>