[Bug 1343661] New: Rebase clufter component