more merges from jna branch