Several updates
Co-authored-by: Luca Prete <lucaprete@google.com> Co-authored-by: Simone Bruzzechesse <bruzzechesse@google.com> Co-authored-by: Simone Ruffilli <sruffilli@google.com>