Merge branch 'ss/get-time-cleanup'