Please proceed when you think this is ready. Needed for gcc-10. Thanks!
2.0.5 stabilization is already being handled by bug 711674 *** This bug has been marked as a duplicate of bug 711674 ***