Alternative Options for #819046