Merge "Add AIO cluster trigger"