Jira Link

CALCITE-XXXX

Changes Proposed