Merge pull request #192 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-49