Merge "Prefer rlibs for diced"