Merge "Fixed Handler Leak on WrapperInit"