Merge "Replace clearAll with withoutDefaultCapabilities"