Near-final commit per 5.0