Add initial support for action multiplier in normal mode.
Merged heads
Fix broken merge.