Merge master to fixed-length-detection

Attempting to merge master's new changes into fixed-length-detection to prevent merge conflicts later.