fix for issues with #310
Merge branch 'develop' into feature_643