Merge "Update oparent and fix nexusiq deps"