merge back the fix of the issue 336(buil test hang)