Update: some actions before merge