Merge "Enable freezer metrics without flag" into main