Working on issue #1074
Merge branch 'develop'