Merge "Add oneway_finalizer_close_fixed flag" into main