MDL-25031, MDL-25198 fixed use of proper table prefixes in blocks upgrade and fixed...