API update to 2.36.4