auto refreshing blocks
merge from origin/master