shARp-6766

shARp-6766