JOJ-30: CRLF for Windows
JOJ-119: Spinup added
Merge remote-tracking branch 'remotes/origin/JOJ-119'