Merge pull request #748 from github/lcartey/a7-1-3

Merge pull request #748 from github/lcartey/a7-1-3 #2425