Merge pull request #180 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-37