Merge "Remove double thread restriction on build"