Back port changes for async inventory stuff. added comment (needs cleaned up if ok).