[Merge] Major update