possible fix for issue 360
Merge branch 'issue_360' into develop