INT-2474: Amend last commit