Merge changes I69baed7b,I38a1da16 into sc-dev

* changes:
  Logging config changes as well
  Reduce some logging from previous CL