Revert "Revert "Merge pull request #24 from GayashanNA/CARBON-14867""

This reverts commit 4048b25bea7c36c019f6ef0d41a1586c90b0f770.