Hops branch - csp6737041