added a few (allow-none) flags. #677013.