SYMPHONY-1615
Minor tweaks based on review.