Merge branch 'rj/add-i-leak-fix'