v2.1.9: (#456, #375, #273, #495)