[#110530] Changes to init structure