Merge "javelin: fix user destruction"