Merge remote-tracking branch 'upstream/dev' into nxl/runtime-aware-search-service