update_avail condition change
crypto conflict merged
changes testing complete flow