Merge pull request #197 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-54