Merge remote-tracking branch 'oleg/gettimeofday' into tmp-merge-pr-644-740