Merge "FRM logging improvements"