Merge "Add Maintenance test trigger"