delta rate added, warming up added
Merge remote-tracking branch 'origin/develop' into develop