Backported r11494 from trunk.
Merged r11507 from trunk (#13329).
Merged r11506 from trunk (#13329).
Merged r11497 from trunk (#13329).
Merged r11488 from trunk.
Merged r11571 from trunk (#12122).
Preserve gantt options when changing filters (#12122).
Merged r11518 from trunk (#8529).
Merged r11519 and r11520 from trunk (#13335).
Merged r11567 from trunk (#13272).
