Merge "Support for changing traces from development settings." into jb-dev