Commit before changing the CPU to be able to run one cycle at a time.
Merge commit '2c70777283f34ccb10524601101c1b9a8d9b4a15'