[#58619246] consolidated some init functions