Make clock a spring thing
Merge remote-tracking branch 'upstream/develop' into PLFM-2866
Merge pull request #1404 from marcel-blonk/PLFM-2866

Make clock proper spring thing