r8595: changes for lml2 rework