Merge pull request #189 from Snowflake-Labs/sfc-gh-cnantasenamat-patch-46