merge from jollysun