merge with master
Add formatblock component