merge from jugglershu