Fix for GH OC #505
Merge branch 'develop'