am 1a3ab7bf: (-s ours) Merge "code coverage improvement (DO NOT MERGE)" into kraken