Ack in manual mode
Merge remote-tracking branch 'ack-in-manual-mode/ack-in-manual-mode'