Merge branch 'ansible-vars' into devel