CLM-2846 and CLM-2839 updates based on review.