Additional updates for AUT-822