Continued work on bug 10373732 and reviewed r/2883