MSB Deliverable for Code Freeze Milestone - M4