Defect 13091788

@jbest84 Please Review