Merge remote-tracking branch 'sepastian/feature_multiple_config_blocks' into HEAD