changes to devel
Merge branch 'devel'

devel changes are finished