Merge branch 'iop-cleanup' into devel