Merge "code coverage improvement (DO NOT MERGE)" into kraken