Merge "bug fix: handle multiple port settings change events signalled at once" into oc-dev