update lsm-light.client code in order to merge into develop branch