apply v5.0 and fix memleak