Please backport #1615 and #2736 to te `gxp` version `release/0.16-g` @maryvictol, please make sure we have test-cases and e2e automation for the same.
Please backport #1615 and #2736 to te
gxpversionrelease/0.16-g@maryvictol, please make sure we have test-cases and e2e automation for the same.