This uses the parts added in r442475. PR: 217425 Submitted by: Mikaël Urankar <mikael.urankar@gmail.com>