Merge branch 'fc/simplify-complete-revlist-file'