Signed-off-by: Hans van den Bogert <hansbogert@gmail.com> (cherry picked from commit f610ecc206)
f610ecc206