[CONSRV]: Continuing code refactoring of revisions 63866, 63867, 63868 and 63874.