RESTRuCTuRE-2260

RESTRuCTuRE-2260