Upstream release 60.5.0esr