Merge "Set filter according to PR/Change in URL" into feature/zuulv3