Merge "Really fix excessive 'trun' box parsing"