Merge changes I4011db5c,I622bc5fa

* changes:
  less logging
  A system setting for "advanced settings."