Lergo 88-92

Merging Lergo:88-92 fix