fix broken of blockchain account presetation
merge from origin master