Merge "Further improvements on the hybrid dwt/dct expt" into experimental