Updates per ticket #5948 (in according to updates 1-29-13.docx).
Updated per tasks 5948 and 6010.