Subtractive merge from collider conditionals removal commit. Unfortunately the compound collider bug does seem to still be around.