merged branch cris-registration (r62082:HEAD)
fixed old package-lock.json
Merging angular-upgrade branch
Angular upgrade to v12
package-lock