Merge branch 'dev_cooperatic' into '#1925-ACL-multiple-down-key-cause-error'

# Conflicts:
#   orders/static/js/orders_helper.js
Status Job ID Name Coverage
  Test
passed #2635
lint:js

00:23

passed #2636
unit:django

01:14