Merge RichCattell's AutoCal and Johann's FSR Marlin