Hotfix for BPFD-314 use of -i for commits
Merge branch 'hotfix-314'