orangepi-h2h3 branch, lib/general.sh doesn't update U-Boot properly

[voodoo84]

Board: Orange Pi Zero
Scripts branch: orangepi-h2h3 (as checked out by Build_OrangePi.sh)
U-Boot variant: 2019.04 mainline

lib/build_image.sh writes u-boot-sunxi-with-spl.bin-${PLATFORM} at proper offset (8 KiB) in $KERNELVER = "1" branch, so the board boots fine.
However, lib/general.sh in function uboot_update() writes u-boot-sunxi-with-spl.bin-${PLATFORM} at wrong offset (16400 KiB), so the board won't boot.

I see this has already been fixed in the master branch in commit 4d581a1, but it should be fixed in H2 branch too.