reintegrate branches/config-1.1, closes #1385 and closes #1389
block bcc904f9764a5651698b9177a45e1dd8ada4ae11 from merging