(cherry picked from commit c3d23323d3047a416568122ea771ce92378b8933)
(cherry picked from commit ae490d80db7ed81fa72cf4efae75906bb9434654)