(cherry picked from commit 731ab89e) Fixes: 129039920 Fixes: 140195904 Merged-In: Ib2abc1d84311dec40e2f9e78551850984cd7ab82