Merge branch 'userContentRemoveTool' into next