merge from develop

Author: XingY

core/package-lock.json

@@ -53,7 +53,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "7.16.0",
+    "@labkey/components": "7.16.1-fb-mvtc-convert.0",
     "@labkey/themes": "1.6.0"
   },
   "devDependencies": {

core/package.json

@@ -13,7 +13,7 @@
     "test-integration": "cross-env NODE_ENV=test jest --ci --runInBand -c test/js/jest.config.integration.js"
   },
   "dependencies": {
-    "@labkey/components": "7.16.0"
+    "@labkey/components": "7.16.1-fb-mvtc-convert.0"
   },
   "devDependencies": {
     "@labkey/build": "8.8.0",