Marking for OSP-13 for now, its possible we'll make this a duplicate of 1804303.
Dan is working on patch.
Patch has merged and will be in OSP-13z12, marking as duplicate. *** This bug has been marked as a duplicate of bug 1804303 ***