[#61920236] Bring current content into new format