Merge pull request #187 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-44