bumped to version 3.9.5
Merge branch 'develop'
fixed conflict