am 3e88a16b: am 2d139fcf: am 0488079d: Merge "Fix the computation of basefilename"

* commit '3e88a16b0e5eb0896d52b5c4e3488527d9a95f26':
  Fix the computation of basefilename