UCLOUDNG-281 and some changes

I couldn't separate those changes into commits because those are on the same file.