LERGO-468 - adding some more safety to the code (checking for negative time differences etc.. )
Merge remote-tracking branch 'origin/develop' into develop