am 84e66f54: DO NOT MERGE Remove default settings during contacts aggregation.

* commit '84e66f5469168132e0ef8efc5e6f08f21608b383':
  DO NOT MERGE Remove default settings during contacts aggregation.