rebase: reorder validation steps