Merge pull request #185 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-42