Merge "GenericSource: reduce logging." into nyc-dev