[OL-1616]