Merge branch 'maint' into java-work