Version descriptor updates for 2.3.6