Merge "Add support lib wrappers for clients"