Merge pull request #194 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-51