Merge "Add CUSTOM mode to native stats"