zagales-diy-19 us2.1 - persistence depends from context: sqlite for devel environment and memory for testing
Merge remote-tracking branch 'origin/zagales-diy-19' into zagales-diy-19