Updates from v1.14.x branch #31

Closed tdoublep closed 4 weeks ago