Merge branch 'topic/ctl-add-remove-fixes' into for-linus