PardoG-2688

PardoG-2688