Merge pull request #186 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-43