rebased onto 5eb3bd821256dd73a937fb64c610d41887e5034c
Merging during freeze since this was already merged into comps.
Pull-Request has been merged by siosm