255269
Update to 1.6.0 Related-to: https://review.rdoproject.org/r/q/I39b2a03acdac35128c16d369dfcfa4dbf851b37d