Topic 2 change

(cherry picked from commit d5ed0e6a098710ad9dfe08bc7039fc6e61d00fa3)