Merge pull request #176 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-33