some feature desc
merge upstream