Assigning to Lukas for review. Lukas, please add an hour estimate for this work to this bug. We will then subtract the hours worked here from the overall tracker, bug 1476113.