getting ready for merge from devel