ZEPPELIN-117 change return type from Collection to List