Dev 10432 Review 2

Da fix 2 defect.