Merge pull request #177 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-34