Abbreviate literals
Update v3.6 release