am 4feb47db: am 84ae085d: am 1cf23e10: am 8661761c: better support for multiple files

* commit '4feb47db8c06d5bf1e33dedebaaf575fbc91a894':