Merge "Rephrase enotif_lastdiff and enotif_lastvisited"