... and improve support coverage of these options. Change-Id: I4f4f45a37cb2371451bca713d7df340de1b1448c