Merge "Fix NPE in renameAccount" into main