Reviewed-by: dfazunen, tschatzl
Test/gc/7072527, test/gc/6845368, test/gc/6581734 renamed Reviewed-by: jwilhelm, pliden