critical bug fix
Finished feature 63821686/yet-another-020-story.
Merge branch 'develop' into release/0.2.0