Patch 1

updates for API9 + performance fixes + log format cleanup.