Merge delay-decode-take2 branch into master.