[Bug 1343661] Rebase clufter component