Merge "registration: Use array_merge() rather than array plus when merging"