Add a test
Slightly more minimal config.
Merge bug26417
stable to default