CB-6728 Support chip architecture

https://issues.apache.org/jira/browse/CB-6728