CS-4815 should now be complete