Merge "Allow compos to use diced"