Github-Pull: #7335 Rebased-From: 7777994846
7777994846
Github-Pull: #7226 Rebased-From: 9b41a5fba2
9b41a5fba2