Merge "valgrind - txfm_thresh not set" into experimental