Merge from Quynh, all the changes to date
undoing validate connect
bring down from github oci-merge-branch
should now be consistent with master