adopt functions from devel version to main version