intermittent in test_settings_from_message
Merge pull request #16668 from viorelaioia/bug-977052

Intermittent in test_settings_from_message