backports to 4.0 branch, switching to DelphiX OS 4.1 for development

Last update for the 4.0 branch before switching to DelphiX OS 4.1 for development