Review #5529: correct phase timing
Review #5529: R1e current-head round
reviews: bhamodi hardening batch, remaining nine