Merge "Add OOJS v1.0.5 to core"