Update to 1.36.1