usage-tracking: incorporate review comments