preparing for merge with acq utils
Merge branch 'canon'