merged in latest changes from xdzk prototype