Merge pull request #190 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-47