Getting things to work

requested review from @jorge.sasiain

assigned to @jorge.sasiain

added 4 commits

• 6ed2485e...60a7d367 - 3 commits from branch develop
• 2a8bfe2e - Merge branch 'develop' into 'getting_things_to_work'

Compare with previous version

mentioned in commit 203d6b86

merged