[Merge] Merge outlook improvement