Documentation of new options from
fae2b84e4ecbe7bcd52a1a5a72e634112d22958b