Merge branch 'sitka_2_6' into Acq26