Merge pull request #178 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-35