OCI <=> NAS interoperability changes

Updated unapplied bits from pull request #7