#412 should be backported to the 1.0 branch via cherry-picking ccf0d5c A new patch release should be issued