[Merge conflicts resolved]