Updates based on Orion I201305012230.