sync up to height 61869

using 2 ugly hacks