Merge branch 'release/1.5.0.16'
Merge branch 'master' into feature/manual_selection
checged selection to manual method
Merge branch 'feature/manual_selection' into develop
bump version
Merge branch 'release/1.5.0.17' into develop