Alternative Options for #540872