Merge branch 'develop' into feat/285-support-ipinfusion-devices-via-netconf