(cherry picked from commit 73e61fa652d1233bfff1db91fa2bca8c317c8caf)
(cherry picked from commit fcabeed7544285f3244465ccfc5337c59e63c6b0)