Comment 13 for bug 1453593

also, test v4.0-rc7 mainline