Merge branch 'jk/fix-refresh-utime' into maint