CLM-2486 and CLM-2839 updates from review.