Issue CS-5825 Part Resolution