Merge branch 'blockcontainer'