rDCS15f1d575e0c2

Merge remote-tracking branch 'origin/feature/iconfiguration' into feature/iconfiguration