Merge pull request #184 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-41