rocks change
(cherry picked from commit d4061ee)