CB-6728 Support chip architecture