Config devel merge to master