Merging updates from `Coin` branch