Fill testsettings detail in exception code
Squashed 'core/' changes from bce4ca4..64fcf7d

64fcf7d Merge commit 'af98ab894c684766ee4d9910956a80505dd72b66'
af98ab8 Squashed 'db/' changes from 062dd9f..b5338aa

git-subtree-dir: core
git-subtree-split: 64fcf7d37037e49d879c13a3e161d20102d1ca9f
Merge commit '80df35b209875699a87a0910eee6a742a6941e72'