app-shells/rrs: [QA] apply PATCHES