Merge "Codec2: clean up base vs. baseIndex confusion"