CS fix
(cherry picked from commit b7a58ec)
(cherry picked from commit dc18898)