Merge branch 'topic/slave_caps_device_control_fix_rebased' into for-linus