Incorporate changes from OOM robot resources

No match.