changed selection_spec
Merge branch 'development' into test-clean