Merge branch 'topic/timestamp' into for-next