merge from JugglerShu-master