Merge "Increase maximum trace files storage limit" into main