Merge pull request #179 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-36