Merge "annotate intentional fallthroughs in switch()"