merge from funshion dev branch