Resolves ITC-634
Fixed conflicts.