diff --git a/package-lock.json b/package-lock.json
index 741671f8..1ce7d7d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -259,7 +259,8 @@
 		"@babel/parser": {
 			"version": "7.7.5",
 			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-			"integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig=="
+			"integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
+			"dev": true
 		},
 		"@babel/plugin-proposal-async-generator-functions": {
 			"version": "7.7.4",
@@ -520,32 +521,117 @@
 			"integrity": "sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA=="
 		},
 		"@ui5/builder": {
-			"version": "1.7.1",
-			"resolved": "https://registry.npmjs.org/@ui5/builder/-/builder-1.7.1.tgz",
-			"integrity": "sha512-xgMqAnCOsBfKQ3hk8CiXFG9RFPktiTJw1KYV+MKEyWMtbrBIg0YdbOFu+PrnKfhI6vOn5YqWi5OA4VyHM8OVBQ==",
+			"version": "github:SAP/ui5-builder#5d09696db18028c28b109e690cd422314debb4e3",
+			"from": "github:SAP/ui5-builder#feature-proxy",
 			"requires": {
 				"@ui5/fs": "^1.1.2",
-				"@ui5/logger": "^1.0.2",
+				"@ui5/logger": "^1.0.1",
 				"cheerio": "^0.22.0",
 				"escape-unicode": "^0.2.0",
-				"escodegen": "^1.12.0",
+				"escodegen": "^1.11.1",
 				"escope": "^3.6.0",
 				"esprima": "^4.0.1",
-				"estraverse": "^4.3.0",
+				"estraverse": "^4.2.0",
 				"globby": "^10.0.1",
-				"graceful-fs": "^4.2.3",
-				"jsdoc": "~3.6.3",
-				"less-openui5": "^0.8.0",
+				"graceful-fs": "^4.2.0",
+				"jsdoc": "3.5.5",
+				"less-openui5": "^0.6.0",
 				"make-dir": "^3.0.0",
 				"pretty-data": "^0.40.0",
 				"pretty-hrtime": "^1.0.3",
 				"replacestream": "^4.0.3",
-				"rimraf": "^3.0.0",
+				"rimraf": "^2.6.3",
 				"semver": "^6.3.0",
 				"slash": "^3.0.0",
-				"terser": "^4.4.0",
-				"xml2js": "^0.4.22",
+				"terser": "^4.1.3",
+				"xml2js": "^0.4.17",
 				"yazl": "^2.5.1"
+			},
+			"dependencies": {
+				"bluebird": {
+					"version": "3.5.5",
+					"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+					"integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+				},
+				"js2xmlparser": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz",
+					"integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=",
+					"requires": {
+						"xmlcreate": "^1.0.1"
+					}
+				},
+				"jsdoc": {
+					"version": "3.5.5",
+					"resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz",
+					"integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==",
+					"requires": {
+						"babylon": "7.0.0-beta.19",
+						"bluebird": "~3.5.0",
+						"catharsis": "~0.8.9",
+						"escape-string-regexp": "~1.0.5",
+						"js2xmlparser": "~3.0.0",
+						"klaw": "~2.0.0",
+						"marked": "~0.3.6",
+						"mkdirp": "~0.5.1",
+						"requizzle": "~0.2.1",
+						"strip-json-comments": "~2.0.1",
+						"taffydb": "2.6.2",
+						"underscore": "~1.8.3"
+					}
+				},
+				"klaw": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz",
+					"integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=",
+					"requires": {
+						"graceful-fs": "^4.1.9"
+					}
+				},
+				"less-openui5": {
+					"version": "0.6.0",
+					"resolved": "https://registry.npmjs.org/less-openui5/-/less-openui5-0.6.0.tgz",
+					"integrity": "sha512-Ncv9fhCkpssBut4Cefqfbf4IRVk8dz44LQJ80zHB6WG9BBsuqoLvWUxbV1VhxRJVGsDNbDcGb2i5s0KvoXJqdg==",
+					"requires": {
+						"clone": "^2.1.0",
+						"css": "^2.2.1",
+						"less": "1.6.3",
+						"object-assign": "^4.0.1"
+					}
+				},
+				"marked": {
+					"version": "0.3.19",
+					"resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz",
+					"integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="
+				},
+				"rimraf": {
+					"version": "2.7.1",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				},
+				"strip-json-comments": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+				},
+				"underscore": {
+					"version": "1.8.3",
+					"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+					"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+				},
+				"xmlcreate": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz",
+					"integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8="
+				}
 			}
 		},
 		"@ui5/fs": {
@@ -590,6 +676,38 @@
 				"read-pkg": "^3.0.0",
 				"read-pkg-up": "^4.0.0",
 				"resolve": "^1.12.0"
+			},
+			"dependencies": {
+				"@ui5/builder": {
+					"version": "1.7.1",
+					"resolved": "https://registry.npmjs.org/@ui5/builder/-/builder-1.7.1.tgz",
+					"integrity": "sha512-xgMqAnCOsBfKQ3hk8CiXFG9RFPktiTJw1KYV+MKEyWMtbrBIg0YdbOFu+PrnKfhI6vOn5YqWi5OA4VyHM8OVBQ==",
+					"dev": true,
+					"requires": {
+						"@ui5/fs": "^1.1.2",
+						"@ui5/logger": "^1.0.2",
+						"cheerio": "^0.22.0",
+						"escape-unicode": "^0.2.0",
+						"escodegen": "^1.12.0",
+						"escope": "^3.6.0",
+						"esprima": "^4.0.1",
+						"estraverse": "^4.3.0",
+						"globby": "^10.0.1",
+						"graceful-fs": "^4.2.3",
+						"jsdoc": "~3.6.3",
+						"less-openui5": "^0.8.0",
+						"make-dir": "^3.0.0",
+						"pretty-data": "^0.40.0",
+						"pretty-hrtime": "^1.0.3",
+						"replacestream": "^4.0.3",
+						"rimraf": "^3.0.0",
+						"semver": "^6.3.0",
+						"slash": "^3.0.0",
+						"terser": "^4.4.0",
+						"xml2js": "^0.4.22",
+						"yazl": "^2.5.1"
+					}
+				}
 			}
 		},
 		"@ui5/server": {
@@ -617,6 +735,38 @@
 				"spdy": "^4.0.1",
 				"treeify": "^1.0.1",
 				"yesno": "^0.3.1"
+			},
+			"dependencies": {
+				"@ui5/builder": {
+					"version": "1.7.1",
+					"resolved": "https://registry.npmjs.org/@ui5/builder/-/builder-1.7.1.tgz",
+					"integrity": "sha512-xgMqAnCOsBfKQ3hk8CiXFG9RFPktiTJw1KYV+MKEyWMtbrBIg0YdbOFu+PrnKfhI6vOn5YqWi5OA4VyHM8OVBQ==",
+					"dev": true,
+					"requires": {
+						"@ui5/fs": "^1.1.2",
+						"@ui5/logger": "^1.0.2",
+						"cheerio": "^0.22.0",
+						"escape-unicode": "^0.2.0",
+						"escodegen": "^1.12.0",
+						"escope": "^3.6.0",
+						"esprima": "^4.0.1",
+						"estraverse": "^4.3.0",
+						"globby": "^10.0.1",
+						"graceful-fs": "^4.2.3",
+						"jsdoc": "~3.6.3",
+						"less-openui5": "^0.8.0",
+						"make-dir": "^3.0.0",
+						"pretty-data": "^0.40.0",
+						"pretty-hrtime": "^1.0.3",
+						"replacestream": "^4.0.3",
+						"rimraf": "^3.0.0",
+						"semver": "^6.3.0",
+						"slash": "^3.0.0",
+						"terser": "^4.4.0",
+						"xml2js": "^0.4.22",
+						"yazl": "^2.5.1"
+					}
+				}
 			}
 		},
 		"accepts": {
@@ -659,6 +809,12 @@
 				"uri-js": "^4.2.2"
 			}
 		},
+		"amdefine": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+			"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+			"optional": true
+		},
 		"ansi-align": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
@@ -800,6 +956,7 @@
 			"version": "1.0.10",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
 			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
 			"requires": {
 				"sprintf-js": "~1.0.2"
 			}
@@ -1074,6 +1231,11 @@
 				"estraverse": "^4.1.1"
 			}
 		},
+		"babylon": {
+			"version": "7.0.0-beta.19",
+			"resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz",
+			"integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A=="
+		},
 		"balanced-match": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -1096,7 +1258,8 @@
 		"bluebird": {
 			"version": "3.7.2",
 			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-			"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+			"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+			"dev": true
 		},
 		"blueimp-md5": {
 			"version": "2.12.0",
@@ -1506,6 +1669,23 @@
 			"integrity": "sha512-u6dx20FBXm+apMi+5x7UVm6EH7BL1gc4XrcnQewjcB7HWRcor/V5qWc3RG2HwpgDJ26gIi2DSEu3B7sXynAw/g==",
 			"dev": true
 		},
+		"clean-css": {
+			"version": "2.0.8",
+			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-2.0.8.tgz",
+			"integrity": "sha1-6TfN/cxXgaAIF67EB56Fs+wVeiA=",
+			"optional": true,
+			"requires": {
+				"commander": "2.0.x"
+			},
+			"dependencies": {
+				"commander": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz",
+					"integrity": "sha1-0bhvkB+LZL2UG96tr5JFMDk76Sg=",
+					"optional": true
+				}
+			}
+		},
 		"clean-stack": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -2625,7 +2805,8 @@
 		"escape-string-regexp": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
+			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+			"dev": true
 		},
 		"escape-unicode": {
 			"version": "0.2.0",
@@ -4222,6 +4403,7 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.0.tgz",
 			"integrity": "sha512-WuNgdZOXVmBk5kUPMcTcVUpbGRzLfNkv7+7APq7WiDihpXVKrgxo6wwRpRl9OQeEBgKCVk9mR7RbzrnNWC8oBw==",
+			"dev": true,
 			"requires": {
 				"xmlcreate": "^2.0.0"
 			}
@@ -4235,6 +4417,7 @@
 			"version": "3.6.3",
 			"resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.3.tgz",
 			"integrity": "sha512-Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A==",
+			"dev": true,
 			"requires": {
 				"@babel/parser": "^7.4.4",
 				"bluebird": "^3.5.4",
@@ -4344,6 +4527,7 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
 			"integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
+			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.9"
 			}
@@ -4363,6 +4547,41 @@
 			"integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=",
 			"dev": true
 		},
+		"less": {
+			"version": "1.6.3",
+			"resolved": "https://registry.npmjs.org/less/-/less-1.6.3.tgz",
+			"integrity": "sha1-cc6J7DC3dLNWfyVMZ5WPLywZO94=",
+			"requires": {
+				"clean-css": "2.0.x",
+				"mime": "1.2.x",
+				"mkdirp": "~0.3.5",
+				"request": ">=2.12.0",
+				"source-map": "0.1.x"
+			},
+			"dependencies": {
+				"mime": {
+					"version": "1.2.11",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+					"integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=",
+					"optional": true
+				},
+				"mkdirp": {
+					"version": "0.3.5",
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+					"integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
+					"optional": true
+				},
+				"source-map": {
+					"version": "0.1.43",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+					"optional": true,
+					"requires": {
+						"amdefine": ">=0.0.4"
+					}
+				}
+			}
+		},
 		"less-openui5": {
 			"version": "0.8.1",
 			"resolved": "https://registry.npmjs.org/less-openui5/-/less-openui5-0.8.1.tgz",
@@ -4388,6 +4607,7 @@
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
 			"integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
+			"dev": true,
 			"requires": {
 				"uc.micro": "^1.0.1"
 			}
@@ -4567,6 +4787,7 @@
 			"version": "8.4.2",
 			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz",
 			"integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==",
+			"dev": true,
 			"requires": {
 				"argparse": "^1.0.7",
 				"entities": "~1.1.1",
@@ -4578,12 +4799,14 @@
 		"markdown-it-anchor": {
 			"version": "5.2.5",
 			"resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.2.5.tgz",
-			"integrity": "sha512-xLIjLQmtym3QpoY9llBgApknl7pxAcN3WDRc2d3rwpl+/YvDZHPmKscGs+L6E05xf2KrCXPBvosWt7MZukwSpQ=="
+			"integrity": "sha512-xLIjLQmtym3QpoY9llBgApknl7pxAcN3WDRc2d3rwpl+/YvDZHPmKscGs+L6E05xf2KrCXPBvosWt7MZukwSpQ==",
+			"dev": true
 		},
 		"marked": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
-			"integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="
+			"integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
+			"dev": true
 		},
 		"matcher": {
 			"version": "2.1.0",
@@ -4612,7 +4835,8 @@
 		"mdurl": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-			"integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
+			"integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+			"dev": true
 		},
 		"media-typer": {
 			"version": "0.3.0",
@@ -5995,6 +6219,7 @@
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz",
 			"integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==",
+			"dev": true,
 			"requires": {
 				"glob": "^7.1.3"
 			}
@@ -6344,7 +6569,8 @@
 		"sprintf-js": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
 		},
 		"sshpk": {
 			"version": "1.16.1",
@@ -6447,7 +6673,8 @@
 		"strip-json-comments": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
-			"integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="
+			"integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
+			"dev": true
 		},
 		"superagent": {
 			"version": "3.8.3",
@@ -6974,7 +7201,8 @@
 		"uc.micro": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-			"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
+			"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+			"dev": true
 		},
 		"uglify-js": {
 			"version": "3.7.1",
@@ -6996,7 +7224,8 @@
 		"underscore": {
 			"version": "1.9.1",
 			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
-			"integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+			"integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==",
+			"dev": true
 		},
 		"unicode-canonical-property-names-ecmascript": {
 			"version": "1.0.4",
@@ -7357,7 +7586,8 @@
 		"xmlcreate": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.1.tgz",
-			"integrity": "sha512-MjGsXhKG8YjTKrDCXseFo3ClbMGvUD4en29H2Cev1dv4P/chlpw6KdYmlCWDkhosBVKRDjM836+3e3pm1cBNJA=="
+			"integrity": "sha512-MjGsXhKG8YjTKrDCXseFo3ClbMGvUD4en29H2Cev1dv4P/chlpw6KdYmlCWDkhosBVKRDjM836+3e3pm1cBNJA==",
+			"dev": true
 		},
 		"xtend": {
 			"version": "4.0.2",
diff --git a/package.json b/package.json
index c54e4fcb..4f9e3436 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
 		"url": "git@github.com:SAP/ui5-server.git"
 	},
 	"dependencies": {
-		"@ui5/builder": "^1.7.1",
+		"@ui5/builder": "SAP/ui5-builder#feature-proxy",
 		"@ui5/fs": "^1.1.2",
 		"@ui5/logger": "^1.0.2",
 		"compression": "^1.7.4",