Merge branch 'diego/hotfix/issue610'