Manually apply an improved version of PR #2427
Manually apply an improved version of PR #2427

jreinert/filebin,jreinert/filebin,Bluewind/filebin,jreinert/filebin,luisvillasenor/iEureka,luisvillasenor/iEureka,jreinert/filebin,zares85/mvf,luisvillasenor/iEureka,Bluewind/filebin,Bluewind/filebin,Bluewind/filebin,jreinert/filebin,zares85/mvf,Bluewind/filebin,jreinert/filebin