Merge branch 'master'
[Fix] makeMasterFile: changing to cumsum for Id mapping