Merge "Fix Flexibility Tracker Dump Function"