Final update based on OU 2.7 updates