Preparing auto-merging citools master