(cherry picked from commit e11dcc60f2)
use backticks to avoid backslash
(cherry picked from commit 34212791ee)
(cherry picked from commit b76c67c99f)
(cherry picked from commit c3c21e3b6b)
(cherry picked from commit 9f4c722db4)
(cherry picked from commit e5360c908a)