#1090 & #1002
Merge pull request #1091 from andrerod/dev

#1090 & #1002