Merge "Add triggers for auto upgrade"