Merge "Remove aliasing"