Issue #3276126 by eleonel: Resolve merge conflicts.