INT-2881: push more review comments