merge dev_cooperatic

Status Job ID Name Coverage
  Test
passed #3725
lint:js

00:23

passed #3726
unit:django

01:04