INT-3433 commit