Change-Id: Iec9d4e9c145ea75fc06d096e9c6905b3e412940c
Also add an option to add_object_to_list to speedup. Change-Id: I9860a950fb98b144d831ded11d5911d3aba77ba5 (cherry picked from commit aa9dd9a02ef4ac4cd6987b02b0c9be6d9ce9097f)
using version 1.0.10