Merge branch 'trivial/remove-io-inspect-spam' into 'develop'