Merge "Fix first-pass encoding test" into experimental