any chance to merge it without change request related stuff? `WebPathResolver` requires separate PR with cleanups and refactoring. So maybe we can address this request realted duplications to that time?