[ros-diffs] [janderwald] 24949: - shuffle resource files a bit