Feature/mica1016

Fix Mica 1016 (configure blocks_node_type during upgrade)