Merge "Added missing triggers and state params for cell up"