One of conflicts in the 4.0.2 to testing merge