resolve merge conflict introduced in 3.4.11 tag