#36 wasn't entirely closed by #46, also I propose of porting the corresponding fixes to the 2.4 LTS branch.
#36 wasn't entirely closed by #46, also I propose of porting the corresponding fixes to the 2.4 LTS branch.