Resume windows support.
Merge remote-tracking branch 'ivan/feature/resume-windows-support'