Completed

-143 for nanolab : OSC last modification