Rebase from analysis branch