Merge "Add a sprinkle of speculative anti-crash dust"