r8384: merging clutter fixes from release branch