Add additional changes from wangjun plugins