Defect-13091672

@jbest84 Please Review