Develop patch

JORGE SASIAINrequested to merge
develop-patch into develop

tox still fails on the imports... but nothnig runs without them

Merge request reports