Merge pull request #199 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-55