Alternative Options for #514377