Revert "Revert "4.5.4.1-Linux Windows compatible""

This reverts commit f3c375f6c3bac4c065acb302d52b0ceec18201a9.