Merge branch 'vala-work' into maint