Update/merge 12 into 13

I think this should be merged after !206 (merged) and !200 (merged) It would probably be conflicts after those two are merged or viceversa. I will fix them should it be needed.

assigned to @carlos.vega

added 10 commits

• 11fdd013...612c2ae5 - 8 commits from branch master
• d4d6c584 - Merge branch 'master' into update/merge_12_into_13
• e59f8c30 - merged migrations

Compare with previous version

added 33 commits

• e59f8c30...95a5e1aa - 32 commits from branch master
• 1af66f31 - Merge branch 'master' into update/merge_12_into_13

Compare with previous version

merged

mentioned in commit 08739dea