[#879] Codebase changes for new config part I