Merge pull request #191 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-48