reintegrate branches/config-1.1, closes #1288 and closes #1292
block 498cb9a2053fc6e29afa7c5418225b138cd34f55 from merging