Merge branch...

Merge branch '220-enhance-configuration-model-and-display-two-additional-fields-on-the-settings-view' into 'develop'

Resolve "Enhance configuration model and display two additional fields on the settings view"

See merge request !27