Merge pull request #183 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-40