devel - master merge