UCLOUDNG-274: apply bug 1171997 patch