Fixed on core-8-6-branch via check-in [5550a1383b7a98f9].