[AW-1610] moving blocks from context to block-configuration