ack-mode
Merge bug25433 into default