Merge "Add barbican to AIO virtual model"