Merge ""wspr": Update w.r.t CL #2327"
tree: d8d66c084c094d632c15869332fb53f4febefa47
  1. services/