(cherry picked from commit c914a6f7d62a04f7a431778ab165aece03da41df)
(cherry picked from commit f55682bf863b781e17c251dd738c604cd7f8e2bc)