[#717] Changed library name to use less e.
Merge from gsi