coinbase proper refix for account types with user-controllable options merge #3118 fix #3117 [ci skip]
