Merge "SF: Trace buffer cache errors"