update to blocks page
merge origin/master