SOS-1836-ce-matt

Go ahead and add your changes on top of these; I'll update the tickets accordingly.