Merge "Rest API: Fix all the bugs in the HWLB, mask issue, etc"