Merge pull request #188 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-45