Merge pull request #196 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-53