Merge branch 'develop' into gig-application-trim-fields

Author: luizrrodrigues

.circleci/config.yml

@@ -283,7 +283,7 @@ workflows:
           filters:
             branches:
               only:                
-                - gig-application-trim-fields
+                - free
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
@@ -297,15 +297,14 @@ workflows:
           filters:
             branches:
               only:
-                - gig-application-trim-fields
+                - free
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         
           filters:
             branches:
               only:
                 - develop
-                - nursoltan-s-issue-5490
       - "approve-smoke-test-on-staging":
           type: approval
           requires: