Release 2.36.0-beta-1