Merge pull request #182 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-39