INT-2881: push review comments