Merge branch 'master' into stoewer
Merge branch 'development' into stoewer
RecordingChannelModel: add midding field 'index'
Merge branch 'stoewer' into development