Merge pull request #181 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-38