UCLOUDNG-277 and small changes