Arq merge 3

@tdiesler manual merge/rebase done.