Update version and bug fix
Merge pull request #7749 from danielebogo/master

Update version and bug fix