Merge "bug fix: configure input port buffer size" into oc-dev