current
merge forshare branch