ADMIN: updates in preparation for 8.36 release