Merge "Fix odlsli restart issue"