MODULES-1219 Add Compatability for >= 4.1.0 stdlib