3.36.90 Update

Updates for 3.36.90