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