All options in alphabetical order
Merge commit '2e70342752a63349eaa5902be6290ed24927466c' into HEAD