adapt handling of default in settings
sync with Context as of 2013-09-15