--- Conflict resolution: None Done differently: Removed typescript types. (cherry picked from commit aee9801d468997ab3cce32978416b697d9df77a7)