Merge branch 'sone-following-times' into next