fixup! fixup! prepare release 0.36.4