Initial patch by Chandan Kumar.
(cherry picked from commit 13ae4d44

)

Co-authored-by: Berker Peksag <berker.peksag@gmail.com>