Merge branch 'development' into release

diff --combined .gitignore
index 15f8eeb6e973632950132b48788aae6fe3987659,b545d161f13c09f0575a38ce0044e4023413b253..e0cc322953854157d48d5681e7727cecc673b299
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -8,10 -8,10 +8,10 @@@ Homestead.yam
  .idea
  npm-debug.log
  yarn-error.log
 -/public/dist
 +/public/dist/*.map
  /public/plugins
 -/public/css
 -/public/js
 +/public/css/*.map
 +/public/js/*.map
  /public/bower
  /public/build/
  /public/favicon.ico
@@@ -32,3 -32,4 +32,4 @@@ webpack-stats.jso
  phpstan.neon
  esbuild-meta.json
  .phpactor.json
+ /*.zip