Merge "Add Barbican integration to AIO model"