Merge "Updates to OOM Portal"