Merge "Faster bugreports (2/n)"